Merge branch 'feature/upstream' into develop

1 files changed, 1683 insertions, 1534 deletions

diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index f6a6639..55b8513 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -1,4 +1,4 @@
-/* Plugins.c generated by valac 0.36.6, the Vala compiler
+/* Plugins.c generated by valac 0.40.4, the Vala compiler
  * generated from Plugins.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -95,9 +96,9 @@ typedef struct _PluginsNotifierPrivate PluginsNotifierPrivate;
 typedef struct _PluginsParamSpecNotifier PluginsParamSpecNotifier;
 enum  {
 	PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL,
-	PLUGINS_NOTIFIER_LAST_SIGNAL
+	PLUGINS_NOTIFIER_NUM_SIGNALS
 };
-static guint plugins_notifier_signals[PLUGINS_NOTIFIER_LAST_SIGNAL] = {0};
+static guint plugins_notifier_signals[PLUGINS_NOTIFIER_NUM_SIGNALS] = {0};
 #define _plugins_extension_point_unref0(var) ((var == NULL) ? NULL : (var = (plugins_extension_point_unref (var), NULL)))
 #define _plugins_pluggable_rep_unref0(var) ((var == NULL) ? NULL : (var = (plugins_pluggable_rep_unref (var), NULL)))
 
@@ -230,163 +231,237 @@ static PluginsNotifier* plugins_notifier_instance = NULL;
 #define PLUGINS_MAX_SPIT_INTERFACE 0
 gpointer plugins_extension_point_ref (gpointer instance);
 void plugins_extension_point_unref (gpointer instance);
-GParamSpec* plugins_param_spec_extension_point (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void plugins_value_set_extension_point (GValue* value, gpointer v_object);
-void plugins_value_take_extension_point (GValue* value, gpointer v_object);
+GParamSpec* plugins_param_spec_extension_point (const gchar* name,
+                                                const gchar* nick,
+                                                const gchar* blurb,
+                                                GType object_type,
+                                                GParamFlags flags);
+void plugins_value_set_extension_point (GValue* value,
+                                        gpointer v_object);
+void plugins_value_take_extension_point (GValue* value,
+                                         gpointer v_object);
 gpointer plugins_value_get_extension_point (const GValue* value);
 GType plugins_extension_point_get_type (void) G_GNUC_CONST;
 #define PLUGINS_EXTENSION_POINT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPointPrivate))
-enum  {
-	PLUGINS_EXTENSION_POINT_DUMMY_PROPERTY
-};
-PluginsExtensionPoint* plugins_extension_point_new (GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
-PluginsExtensionPoint* plugins_extension_point_construct (GType object_type, GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
-static void plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self, GType value);
-static void plugins_extension_point_set_name (PluginsExtensionPoint* self, const gchar* value);
-static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self, const gchar* value);
-static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, gchar** value, int value_length1);
+PluginsExtensionPoint* plugins_extension_point_new (GType pluggable_type,
+                                                    const gchar* name,
+                                                    const gchar* icon_name,
+                                                    gchar** core_ids,
+                                                    int core_ids_length1);
+PluginsExtensionPoint* plugins_extension_point_construct (GType object_type,
+                                                          GType pluggable_type,
+                                                          const gchar* name,
+                                                          const gchar* icon_name,
+                                                          gchar** core_ids,
+                                                          int core_ids_length1);
+static void plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self,
+                                                 GType value);
+static void plugins_extension_point_set_name (PluginsExtensionPoint* self,
+                                       const gchar* value);
+static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self,
+                                            const gchar* value);
+static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self,
+                                           gchar** value,
+                                           int value_length1);
 GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self);
 const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self);
 const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self);
-gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* result_length1);
-static gchar** _vala_array_dup16 (gchar** self, int length);
+gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self,
+                                              int* result_length1);
+static gchar** _vala_array_dup16 (gchar** self,
+                           int length);
 static void plugins_extension_point_finalize (PluginsExtensionPoint * obj);
 gpointer plugins_module_rep_ref (gpointer instance);
 void plugins_module_rep_unref (gpointer instance);
-GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void plugins_value_set_module_rep (GValue* value, gpointer v_object);
-void plugins_value_take_module_rep (GValue* value, gpointer v_object);
+GParamSpec* plugins_param_spec_module_rep (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void plugins_value_set_module_rep (GValue* value,
+                                   gpointer v_object);
+void plugins_value_take_module_rep (GValue* value,
+                                    gpointer v_object);
 gpointer plugins_value_get_module_rep (const GValue* value);
 GType plugins_module_rep_get_type (void) G_GNUC_CONST;
-enum  {
-	PLUGINS_MODULE_REP_DUMMY_PROPERTY
-};
 static PluginsModuleRep* plugins_module_rep_new (GFile* file);
-static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile* file);
+static PluginsModuleRep* plugins_module_rep_construct (GType object_type,
+                                                GFile* file);
 PluginsModuleRep* plugins_module_rep_open (GFile* file);
 static void plugins_module_rep_finalize (PluginsModuleRep * obj);
 gpointer plugins_pluggable_rep_ref (gpointer instance);
 void plugins_pluggable_rep_unref (gpointer instance);
-GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object);
-void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object);
+GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name,
+                                              const gchar* nick,
+                                              const gchar* blurb,
+                                              GType object_type,
+                                              GParamFlags flags);
+void plugins_value_set_pluggable_rep (GValue* value,
+                                      gpointer v_object);
+void plugins_value_take_pluggable_rep (GValue* value,
+                                       gpointer v_object);
 gpointer plugins_value_get_pluggable_rep (const GValue* value);
 GType plugins_pluggable_rep_get_type (void) G_GNUC_CONST;
 #define PLUGINS_PLUGGABLE_REP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_PLUGGABLE_REP, PluginsPluggableRepPrivate))
-enum  {
-	PLUGINS_PLUGGABLE_REP_DUMMY_PROPERTY
-};
 PluginsPluggableRep* plugins_pluggable_rep_new (SpitPluggable* pluggable);
-PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type, SpitPluggable* pluggable);
-static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, SpitPluggable* value);
-static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self, const gchar* value);
+PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type,
+                                                      SpitPluggable* pluggable);
+static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self,
+                                          SpitPluggable* value);
+static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self,
+                                   const gchar* value);
 void plugins_pluggable_rep_activate (PluginsPluggableRep* self);
 gboolean plugins_is_core_pluggable (SpitPluggable* pluggable);
 SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self);
-static void plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self, gboolean value);
+static void plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self,
+                                        gboolean value);
 GType fuzzy_property_state_get_type (void) G_GNUC_CONST;
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
-FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, const gchar* id);
+FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self,
+                                                           const gchar* id);
 const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self);
 gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self);
-static void plugins_pluggable_rep_set_activated (PluginsPluggableRep* self, gboolean value);
+static void plugins_pluggable_rep_set_activated (PluginsPluggableRep* self,
+                                          gboolean value);
 gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self);
-gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean enabled);
-void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled);
+gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self,
+                                            gboolean enabled);
+void configuration_facade_set_plugin_enabled (ConfigurationFacade* self,
+                                              const gchar* id,
+                                              gboolean enabled);
 gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self);
 static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj);
 void plugins_init (GError** error);
 GFile* app_dirs_get_user_plugins_dir (void);
-static void _vala_array_add50 (GFile** * array, int* length, int* size, GFile* value);
+static void _vala_array_add50 (GFile** * array,
+                        int* length,
+                        int* size,
+                        GFile* value);
 GFile* app_dirs_get_system_plugins_dir (void);
-static void _vala_array_add51 (GFile** * array, int* length, int* size, GFile* value);
-void plugins_search_for_plugins (GFile* dir, GError** error);
+static void _vala_array_add51 (GFile** * array,
+                        int* length,
+                        int* size,
+                        GFile* value);
+void plugins_search_for_plugins (GFile* dir,
+                                 GError** error);
 void plugins_terminate (void);
 gpointer plugins_notifier_ref (gpointer instance);
 void plugins_notifier_unref (gpointer instance);
-GParamSpec* plugins_param_spec_notifier (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void plugins_value_set_notifier (GValue* value, gpointer v_object);
-void plugins_value_take_notifier (GValue* value, gpointer v_object);
+GParamSpec* plugins_param_spec_notifier (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags);
+void plugins_value_set_notifier (GValue* value,
+                                 gpointer v_object);
+void plugins_value_take_notifier (GValue* value,
+                                  gpointer v_object);
 gpointer plugins_value_get_notifier (const GValue* value);
 GType plugins_notifier_get_type (void) G_GNUC_CONST;
-enum  {
-	PLUGINS_NOTIFIER_DUMMY_PROPERTY
-};
 static PluginsNotifier* plugins_notifier_new (void);
 static PluginsNotifier* plugins_notifier_construct (GType object_type);
 PluginsNotifier* plugins_notifier_get_instance (void);
-static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure,
+                                                   GValue * return_value,
+                                                   guint n_param_values,
+                                                   const GValue * param_values,
+                                                   gpointer invocation_hint,
+                                                   gpointer marshal_data);
 static void plugins_notifier_finalize (PluginsNotifier * obj);
-void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
+void plugins_register_extension_point (GType type,
+                                       const gchar* name,
+                                       const gchar* icon_name,
+                                       gchar** core_ids,
+                                       int core_ids_length1);
 GeeCollection* plugins_get_pluggables (gboolean include_disabled);
 PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle);
-static SpitPluggable** _vala_array_dup17 (SpitPluggable** self, int length);
+static SpitPluggable** _vala_array_dup17 (SpitPluggable** self,
+                                   int length);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify);
-GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
+GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func,
+                                             void* compare_func_target,
+                                             GDestroyNotify compare_func_target_destroy_notify);
+GeeCollection* plugins_get_pluggables_for_type (GType type,
+                                                GCompareDataFunc compare_func,
+                                                void* compare_func_target,
+                                                GDestroyNotify compare_func_target_destroy_notify,
+                                                gboolean include_disabled);
 gchar* plugins_get_pluggable_name (const gchar* id);
-gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info);
-gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled);
-void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled);
+gboolean plugins_get_pluggable_info (const gchar* id,
+                                     SpitPluggableInfo* info);
+gboolean plugins_get_pluggable_enabled (const gchar* id,
+                                        gboolean* enabled);
+void plugins_set_pluggable_enabled (const gchar* id,
+                                    gboolean enabled);
 GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable);
-gint plugins_compare_pluggable_names (void* a, void* b);
-gint plugins_compare_extension_point_names (void* a, void* b);
+gint plugins_compare_pluggable_names (void* a,
+                                      void* b);
+gint plugins_compare_extension_point_names (void* a,
+                                            void* b);
 gboolean plugins_is_shared_library (GFile* file);
-void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
+void disassemble_filename (const gchar* basename,
+                           gchar* * name,
+                           gchar* * ext);
 #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value"
 void plugins_load_module (GFile* file);
 GType prepare_input_text_options_get_type (void) G_GNUC_CONST;
-gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length);
-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);
+gchar* prepare_input_text (const gchar* text,
+                           PrepareInputTextOptions options,
+                           gint dest_length);
+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);
 
 const gchar* PLUGINS_SHARED_LIB_EXTS[2] = {"so", "la"};
 
-PluginsExtensionPoint* plugins_extension_point_construct (GType object_type, GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) {
+PluginsExtensionPoint*
+plugins_extension_point_construct (GType object_type,
+                                   GType pluggable_type,
+                                   const gchar* name,
+                                   const gchar* icon_name,
+                                   gchar** core_ids,
+                                   int core_ids_length1)
+{
 	PluginsExtensionPoint* self = NULL;
-	GType _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
 #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = (PluginsExtensionPoint*) g_type_create_instance (object_type);
 #line 26 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = pluggable_type;
-#line 26 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	plugins_extension_point_set_pluggable_type (self, _tmp0_);
-#line 27 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = name;
+	plugins_extension_point_set_pluggable_type (self, pluggable_type);
 #line 27 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	plugins_extension_point_set_name (self, _tmp1_);
+	plugins_extension_point_set_name (self, name);
 #line 28 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = icon_name;
-#line 28 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	plugins_extension_point_set_icon_name (self, _tmp2_);
-#line 29 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = core_ids;
-#line 29 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3__length1 = core_ids_length1;
+	plugins_extension_point_set_icon_name (self, icon_name);
 #line 29 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	plugins_extension_point_set_core_ids (self, _tmp3_, _tmp3__length1);
+	plugins_extension_point_set_core_ids (self, core_ids, core_ids_length1);
 #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self;
-#line 379 "Plugins.c"
+#line 446 "Plugins.c"
 }
 
 
-PluginsExtensionPoint* plugins_extension_point_new (GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) {
+PluginsExtensionPoint*
+plugins_extension_point_new (GType pluggable_type,
+                             const gchar* name,
+                             const gchar* icon_name,
+                             gchar** core_ids,
+                             int core_ids_length1)
+{
 #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return plugins_extension_point_construct (PLUGINS_TYPE_EXTENSION_POINT, pluggable_type, name, icon_name, core_ids, core_ids_length1);
-#line 386 "Plugins.c"
+#line 459 "Plugins.c"
 }
 
 
-GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self) {
+GType
+plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self)
+{
 	GType result;
 	GType _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -397,23 +472,25 @@ GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self) {
 	result = _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 401 "Plugins.c"
+#line 476 "Plugins.c"
 }
 
 
-static void plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self, GType value) {
-	GType _tmp0_;
+static void
+plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self,
+                                            GType value)
+{
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self));
 #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = value;
-#line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->_pluggable_type = _tmp0_;
-#line 413 "Plugins.c"
+	self->priv->_pluggable_type = value;
+#line 488 "Plugins.c"
 }
 
 
-const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self) {
+const gchar*
+plugins_extension_point_get_name (PluginsExtensionPoint* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -424,28 +501,30 @@ const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self) {
 	result = _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 428 "Plugins.c"
+#line 505 "Plugins.c"
 }
 
 
-static void plugins_extension_point_set_name (PluginsExtensionPoint* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+plugins_extension_point_set_name (PluginsExtensionPoint* self,
+                                  const gchar* value)
+{
+	gchar* _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self));
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = value;
-#line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (self->priv->_name);
 #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->_name = _tmp1_;
-#line 445 "Plugins.c"
+	self->priv->_name = _tmp0_;
+#line 522 "Plugins.c"
 }
 
 
-const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self) {
+const gchar*
+plugins_extension_point_get_icon_name (PluginsExtensionPoint* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -456,28 +535,31 @@ const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self)
 	result = _tmp0_;
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 460 "Plugins.c"
+#line 539 "Plugins.c"
 }
 
 
-static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+plugins_extension_point_set_icon_name (PluginsExtensionPoint* self,
+                                       const gchar* value)
+{
+	gchar* _tmp0_;
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self));
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = value;
-#line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (self->priv->_icon_name);
 #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->_icon_name = _tmp1_;
-#line 477 "Plugins.c"
+	self->priv->_icon_name = _tmp0_;
+#line 556 "Plugins.c"
 }
 
 
-gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* result_length1) {
+gchar**
+plugins_extension_point_get_core_ids (PluginsExtensionPoint* self,
+                                      int* result_length1)
+{
 	gchar** result;
 	gchar** _tmp0_;
 	gint _tmp0__length1;
@@ -497,162 +579,188 @@ gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int*
 	if (result_length1) {
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*result_length1 = _tmp1__length1;
-#line 501 "Plugins.c"
+#line 583 "Plugins.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 507 "Plugins.c"
+#line 589 "Plugins.c"
 }
 
 
-static gchar** _vala_array_dup16 (gchar** self, int length) {
+static gchar**
+_vala_array_dup16 (gchar** self,
+                   int length)
+{
 	gchar** result;
 	int i;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	for (i = 0; i < length; i++) {
-#line 518 "Plugins.c"
+#line 603 "Plugins.c"
 		gchar* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		result[i] = _tmp0_;
-#line 524 "Plugins.c"
+#line 609 "Plugins.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 528 "Plugins.c"
+#line 613 "Plugins.c"
 }
 
 
-static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, gchar** value, int value_length1) {
+static void
+plugins_extension_point_set_core_ids (PluginsExtensionPoint* self,
+                                      gchar** value,
+                                      int value_length1)
+{
 	gchar** _tmp0_;
 	gint _tmp0__length1;
-	gchar** _tmp1_;
-	gint _tmp1__length1;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self));
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = value;
+	_tmp0_ = (value != NULL) ? _vala_array_dup16 (value, value_length1) : ((gpointer) value);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0__length1 = value_length1;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup16 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_core_ids = (_vala_array_free (self->priv->_core_ids, self->priv->_core_ids_length1, (GDestroyNotify) g_free), NULL);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->_core_ids = _tmp1_;
+	self->priv->_core_ids = _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->_core_ids_length1 = _tmp1__length1;
+	self->priv->_core_ids_length1 = _tmp0__length1;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->__core_ids_size_ = self->priv->_core_ids_length1;
-#line 555 "Plugins.c"
+#line 638 "Plugins.c"
 }
 
 
-static void plugins_value_extension_point_init (GValue* value) {
+static void
+plugins_value_extension_point_init (GValue* value)
+{
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	value->data[0].v_pointer = NULL;
-#line 562 "Plugins.c"
+#line 647 "Plugins.c"
 }
 
 
-static void plugins_value_extension_point_free_value (GValue* value) {
+static void
+plugins_value_extension_point_free_value (GValue* value)
+{
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (value->data[0].v_pointer) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_extension_point_unref (value->data[0].v_pointer);
-#line 571 "Plugins.c"
+#line 658 "Plugins.c"
 	}
 }
 
 
-static void plugins_value_extension_point_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+plugins_value_extension_point_copy_value (const GValue* src_value,
+                                          GValue* dest_value)
+{
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (src_value->data[0].v_pointer) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = plugins_extension_point_ref (src_value->data[0].v_pointer);
-#line 581 "Plugins.c"
+#line 671 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 585 "Plugins.c"
+#line 675 "Plugins.c"
 	}
 }
 
 
-static gpointer plugins_value_extension_point_peek_pointer (const GValue* value) {
+static gpointer
+plugins_value_extension_point_peek_pointer (const GValue* value)
+{
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 593 "Plugins.c"
+#line 685 "Plugins.c"
 }
 
 
-static gchar* plugins_value_extension_point_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+plugins_value_extension_point_collect_value (GValue* value,
+                                             guint n_collect_values,
+                                             GTypeCValue* collect_values,
+                                             guint collect_flags)
+{
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (collect_values[0].v_pointer) {
-#line 600 "Plugins.c"
+#line 697 "Plugins.c"
 		PluginsExtensionPoint * object;
 		object = collect_values[0].v_pointer;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 607 "Plugins.c"
+#line 704 "Plugins.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 611 "Plugins.c"
+#line 708 "Plugins.c"
 		}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = plugins_extension_point_ref (object);
-#line 615 "Plugins.c"
+#line 712 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 619 "Plugins.c"
+#line 716 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 623 "Plugins.c"
+#line 720 "Plugins.c"
 }
 
 
-static gchar* plugins_value_extension_point_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+plugins_value_extension_point_lcopy_value (const GValue* value,
+                                           guint n_collect_values,
+                                           GTypeCValue* collect_values,
+                                           guint collect_flags)
+{
 	PluginsExtensionPoint ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!object_p) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 634 "Plugins.c"
+#line 736 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!value->data[0].v_pointer) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = NULL;
-#line 640 "Plugins.c"
+#line 742 "Plugins.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = value->data[0].v_pointer;
-#line 644 "Plugins.c"
+#line 746 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = plugins_extension_point_ref (value->data[0].v_pointer);
-#line 648 "Plugins.c"
+#line 750 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 652 "Plugins.c"
+#line 754 "Plugins.c"
 }
 
 
-GParamSpec* plugins_param_spec_extension_point (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+plugins_param_spec_extension_point (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags)
+{
 	PluginsParamSpecExtensionPoint* spec;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PLUGINS_TYPE_EXTENSION_POINT), NULL);
@@ -662,20 +770,25 @@ GParamSpec* plugins_param_spec_extension_point (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return G_PARAM_SPEC (spec);
-#line 666 "Plugins.c"
+#line 774 "Plugins.c"
 }
 
 
-gpointer plugins_value_get_extension_point (const GValue* value) {
+gpointer
+plugins_value_get_extension_point (const GValue* value)
+{
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT), NULL);
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 675 "Plugins.c"
+#line 785 "Plugins.c"
 }
 
 
-void plugins_value_set_extension_point (GValue* value, gpointer v_object) {
+void
+plugins_value_set_extension_point (GValue* value,
+                                   gpointer v_object)
+{
 	PluginsExtensionPoint * old;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT));
@@ -691,22 +804,25 @@ void plugins_value_set_extension_point (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_extension_point_ref (value->data[0].v_pointer);
-#line 695 "Plugins.c"
+#line 808 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 699 "Plugins.c"
+#line 812 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_extension_point_unref (old);
-#line 705 "Plugins.c"
+#line 818 "Plugins.c"
 	}
 }
 
 
-void plugins_value_take_extension_point (GValue* value, gpointer v_object) {
+void
+plugins_value_take_extension_point (GValue* value,
+                                    gpointer v_object)
+{
 	PluginsExtensionPoint * old;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT));
@@ -720,42 +836,48 @@ void plugins_value_take_extension_point (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = v_object;
-#line 724 "Plugins.c"
+#line 840 "Plugins.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 728 "Plugins.c"
+#line 844 "Plugins.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_extension_point_unref (old);
-#line 734 "Plugins.c"
+#line 850 "Plugins.c"
 	}
 }
 
 
-static void plugins_extension_point_class_init (PluginsExtensionPointClass * klass) {
+static void
+plugins_extension_point_class_init (PluginsExtensionPointClass * klass)
+{
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_extension_point_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	((PluginsExtensionPointClass *) klass)->finalize = plugins_extension_point_finalize;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_type_class_add_private (klass, sizeof (PluginsExtensionPointPrivate));
-#line 746 "Plugins.c"
+#line 864 "Plugins.c"
 }
 
 
-static void plugins_extension_point_instance_init (PluginsExtensionPoint * self) {
+static void
+plugins_extension_point_instance_init (PluginsExtensionPoint * self)
+{
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv = PLUGINS_EXTENSION_POINT_GET_PRIVATE (self);
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->ref_count = 1;
-#line 755 "Plugins.c"
+#line 875 "Plugins.c"
 }
 
 
-static void plugins_extension_point_finalize (PluginsExtensionPoint * obj) {
+static void
+plugins_extension_point_finalize (PluginsExtensionPoint * obj)
+{
 	PluginsExtensionPoint * self;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint);
@@ -767,11 +889,13 @@ static void plugins_extension_point_finalize (PluginsExtensionPoint * obj) {
 	_g_free0 (self->priv->_icon_name);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv->_core_ids = (_vala_array_free (self->priv->_core_ids, self->priv->_core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 771 "Plugins.c"
+#line 893 "Plugins.c"
 }
 
 
-GType plugins_extension_point_get_type (void) {
+GType
+plugins_extension_point_get_type (void)
+{
 	static volatile gsize plugins_extension_point_type_id__volatile = 0;
 	if (g_once_init_enter (&plugins_extension_point_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { plugins_value_extension_point_init, plugins_value_extension_point_free_value, plugins_value_extension_point_copy_value, plugins_value_extension_point_peek_pointer, "p", plugins_value_extension_point_collect_value, "p", plugins_value_extension_point_lcopy_value };
@@ -785,18 +909,22 @@ GType plugins_extension_point_get_type (void) {
 }
 
 
-gpointer plugins_extension_point_ref (gpointer instance) {
+gpointer
+plugins_extension_point_ref (gpointer instance)
+{
 	PluginsExtensionPoint * self;
 	self = instance;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return instance;
-#line 796 "Plugins.c"
+#line 922 "Plugins.c"
 }
 
 
-void plugins_extension_point_unref (gpointer instance) {
+void
+plugins_extension_point_unref (gpointer instance)
+{
 	PluginsExtensionPoint * self;
 	self = instance;
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -805,217 +933,244 @@ void plugins_extension_point_unref (gpointer instance) {
 		PLUGINS_EXTENSION_POINT_GET_CLASS (self)->finalize (self);
 #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 809 "Plugins.c"
+#line 937 "Plugins.c"
 	}
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 817 "Plugins.c"
+#line 947 "Plugins.c"
 }
 
 
-static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile* file) {
+static PluginsModuleRep*
+plugins_module_rep_construct (GType object_type,
+                              GFile* file)
+{
 	PluginsModuleRep* self = NULL;
 	GFile* _tmp0_;
-	GFile* _tmp1_;
-	GFile* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	GModule* _tmp5_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	GModule* _tmp3_;
 #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = (PluginsModuleRep*) g_type_create_instance (object_type);
 #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = file;
-#line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (file);
 #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_object_unref0 (self->file);
 #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->file = _tmp1_;
+	self->file = _tmp0_;
 #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = file;
+	_tmp1_ = g_file_get_path (file);
 #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = g_file_get_path (_tmp2_);
-#line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = _tmp1_;
 #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp5_ = g_module_open (_tmp4_, G_MODULE_BIND_LAZY);
+	_tmp3_ = g_module_open (_tmp2_, G_MODULE_BIND_LAZY);
 #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_module_close0 (self->module);
 #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->module = _tmp5_;
+	self->module = _tmp3_;
 #line 43 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp2_);
 #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self;
-#line 857 "Plugins.c"
+#line 984 "Plugins.c"
 }
 
 
-static PluginsModuleRep* plugins_module_rep_new (GFile* file) {
+static PluginsModuleRep*
+plugins_module_rep_new (GFile* file)
+{
 #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return plugins_module_rep_construct (PLUGINS_TYPE_MODULE_REP, file);
-#line 864 "Plugins.c"
+#line 993 "Plugins.c"
 }
 
 
-static gpointer _plugins_module_rep_ref0 (gpointer self) {
+static gpointer
+_plugins_module_rep_ref0 (gpointer self)
+{
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self ? plugins_module_rep_ref (self) : NULL;
-#line 871 "Plugins.c"
+#line 1002 "Plugins.c"
 }
 
 
-PluginsModuleRep* plugins_module_rep_open (GFile* file) {
+PluginsModuleRep*
+plugins_module_rep_open (GFile* file)
+{
 	PluginsModuleRep* result = NULL;
 	PluginsModuleRep* module_rep = NULL;
-	GFile* _tmp0_;
-	PluginsModuleRep* _tmp1_;
-	PluginsModuleRep* _tmp2_ = NULL;
-	PluginsModuleRep* _tmp3_;
-	GModule* _tmp4_;
-	PluginsModuleRep* _tmp6_;
+	PluginsModuleRep* _tmp0_;
+	PluginsModuleRep* _tmp1_ = NULL;
+	PluginsModuleRep* _tmp2_;
+	GModule* _tmp3_;
+	PluginsModuleRep* _tmp5_;
 #line 54 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 55 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = file;
+	_tmp0_ = plugins_module_rep_new (file);
 #line 55 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = plugins_module_rep_new (_tmp0_);
-#line 55 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	module_rep = _tmp1_;
+	module_rep = _tmp0_;
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = module_rep;
+	_tmp2_ = module_rep;
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = _tmp3_->module;
+	_tmp3_ = _tmp2_->module;
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp4_ != NULL) {
-#line 898 "Plugins.c"
-		PluginsModuleRep* _tmp5_;
+	if (_tmp3_ != NULL) {
+#line 1028 "Plugins.c"
+		PluginsModuleRep* _tmp4_;
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp5_ = module_rep;
+		_tmp4_ = module_rep;
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp2_ = _tmp5_;
-#line 904 "Plugins.c"
+		_tmp1_ = _tmp4_;
+#line 1034 "Plugins.c"
 	} else {
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp2_ = NULL;
-#line 908 "Plugins.c"
+		_tmp1_ = NULL;
+#line 1038 "Plugins.c"
 	}
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp6_ = _plugins_module_rep_ref0 (_tmp2_);
+	_tmp5_ = _plugins_module_rep_ref0 (_tmp1_);
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	result = _tmp6_;
+	result = _tmp5_;
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_module_rep_unref0 (module_rep);
 #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 918 "Plugins.c"
+#line 1048 "Plugins.c"
 }
 
 
-static void plugins_value_module_rep_init (GValue* value) {
+static void
+plugins_value_module_rep_init (GValue* value)
+{
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	value->data[0].v_pointer = NULL;
-#line 925 "Plugins.c"
+#line 1057 "Plugins.c"
 }
 
 
-static void plugins_value_module_rep_free_value (GValue* value) {
+static void
+plugins_value_module_rep_free_value (GValue* value)
+{
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (value->data[0].v_pointer) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_module_rep_unref (value->data[0].v_pointer);
-#line 934 "Plugins.c"
+#line 1068 "Plugins.c"
 	}
 }
 
 
-static void plugins_value_module_rep_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+plugins_value_module_rep_copy_value (const GValue* src_value,
+                                     GValue* dest_value)
+{
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (src_value->data[0].v_pointer) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = plugins_module_rep_ref (src_value->data[0].v_pointer);
-#line 944 "Plugins.c"
+#line 1081 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 948 "Plugins.c"
+#line 1085 "Plugins.c"
 	}
 }
 
 
-static gpointer plugins_value_module_rep_peek_pointer (const GValue* value) {
+static gpointer
+plugins_value_module_rep_peek_pointer (const GValue* value)
+{
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 956 "Plugins.c"
+#line 1095 "Plugins.c"
 }
 
 
-static gchar* plugins_value_module_rep_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+plugins_value_module_rep_collect_value (GValue* value,
+                                        guint n_collect_values,
+                                        GTypeCValue* collect_values,
+                                        guint collect_flags)
+{
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (collect_values[0].v_pointer) {
-#line 963 "Plugins.c"
+#line 1107 "Plugins.c"
 		PluginsModuleRep * object;
 		object = collect_values[0].v_pointer;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 970 "Plugins.c"
+#line 1114 "Plugins.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 974 "Plugins.c"
+#line 1118 "Plugins.c"
 		}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = plugins_module_rep_ref (object);
-#line 978 "Plugins.c"
+#line 1122 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 982 "Plugins.c"
+#line 1126 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 986 "Plugins.c"
+#line 1130 "Plugins.c"
 }
 
 
-static gchar* plugins_value_module_rep_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+plugins_value_module_rep_lcopy_value (const GValue* value,
+                                      guint n_collect_values,
+                                      GTypeCValue* collect_values,
+                                      guint collect_flags)
+{
 	PluginsModuleRep ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!object_p) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 997 "Plugins.c"
+#line 1146 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!value->data[0].v_pointer) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = NULL;
-#line 1003 "Plugins.c"
+#line 1152 "Plugins.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1007 "Plugins.c"
+#line 1156 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = plugins_module_rep_ref (value->data[0].v_pointer);
-#line 1011 "Plugins.c"
+#line 1160 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 1015 "Plugins.c"
+#line 1164 "Plugins.c"
 }
 
 
-GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+plugins_param_spec_module_rep (const gchar* name,
+                               const gchar* nick,
+                               const gchar* blurb,
+                               GType object_type,
+                               GParamFlags flags)
+{
 	PluginsParamSpecModuleRep* spec;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PLUGINS_TYPE_MODULE_REP), NULL);
@@ -1025,20 +1180,25 @@ GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return G_PARAM_SPEC (spec);
-#line 1029 "Plugins.c"
+#line 1184 "Plugins.c"
 }
 
 
-gpointer plugins_value_get_module_rep (const GValue* value) {
+gpointer
+plugins_value_get_module_rep (const GValue* value)
+{
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP), NULL);
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 1038 "Plugins.c"
+#line 1195 "Plugins.c"
 }
 
 
-void plugins_value_set_module_rep (GValue* value, gpointer v_object) {
+void
+plugins_value_set_module_rep (GValue* value,
+                              gpointer v_object)
+{
 	PluginsModuleRep * old;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP));
@@ -1054,22 +1214,25 @@ void plugins_value_set_module_rep (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_module_rep_ref (value->data[0].v_pointer);
-#line 1058 "Plugins.c"
+#line 1218 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1062 "Plugins.c"
+#line 1222 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_module_rep_unref (old);
-#line 1068 "Plugins.c"
+#line 1228 "Plugins.c"
 	}
 }
 
 
-void plugins_value_take_module_rep (GValue* value, gpointer v_object) {
+void
+plugins_value_take_module_rep (GValue* value,
+                               gpointer v_object)
+{
 	PluginsModuleRep * old;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP));
@@ -1083,31 +1246,35 @@ void plugins_value_take_module_rep (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = v_object;
-#line 1087 "Plugins.c"
+#line 1250 "Plugins.c"
 	} else {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1091 "Plugins.c"
+#line 1254 "Plugins.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_module_rep_unref (old);
-#line 1097 "Plugins.c"
+#line 1260 "Plugins.c"
 	}
 }
 
 
-static void plugins_module_rep_class_init (PluginsModuleRepClass * klass) {
+static void
+plugins_module_rep_class_init (PluginsModuleRepClass * klass)
+{
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_module_rep_parent_class = g_type_class_peek_parent (klass);
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	((PluginsModuleRepClass *) klass)->finalize = plugins_module_rep_finalize;
-#line 1107 "Plugins.c"
+#line 1272 "Plugins.c"
 }
 
 
-static void plugins_module_rep_instance_init (PluginsModuleRep * self) {
+static void
+plugins_module_rep_instance_init (PluginsModuleRep * self)
+{
 #line 36 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->spit_module = NULL;
 #line 37 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1116,11 +1283,13 @@ static void plugins_module_rep_instance_init (PluginsModuleRep * self) {
 	self->id = NULL;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->ref_count = 1;
-#line 1120 "Plugins.c"
+#line 1287 "Plugins.c"
 }
 
 
-static void plugins_module_rep_finalize (PluginsModuleRep * obj) {
+static void
+plugins_module_rep_finalize (PluginsModuleRep * obj)
+{
 	PluginsModuleRep * self;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MODULE_REP, PluginsModuleRep);
@@ -1138,11 +1307,13 @@ static void plugins_module_rep_finalize (PluginsModuleRep * obj) {
 	_g_object_unref0 (self->spit_module);
 #line 38 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (self->id);
-#line 1142 "Plugins.c"
+#line 1311 "Plugins.c"
 }
 
 
-GType plugins_module_rep_get_type (void) {
+GType
+plugins_module_rep_get_type (void)
+{
 	static volatile gsize plugins_module_rep_type_id__volatile = 0;
 	if (g_once_init_enter (&plugins_module_rep_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { plugins_value_module_rep_init, plugins_value_module_rep_free_value, plugins_value_module_rep_copy_value, plugins_value_module_rep_peek_pointer, "p", plugins_value_module_rep_collect_value, "p", plugins_value_module_rep_lcopy_value };
@@ -1156,18 +1327,22 @@ GType plugins_module_rep_get_type (void) {
 }
 
 
-gpointer plugins_module_rep_ref (gpointer instance) {
+gpointer
+plugins_module_rep_ref (gpointer instance)
+{
 	PluginsModuleRep * self;
 	self = instance;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return instance;
-#line 1167 "Plugins.c"
+#line 1340 "Plugins.c"
 }
 
 
-void plugins_module_rep_unref (gpointer instance) {
+void
+plugins_module_rep_unref (gpointer instance)
+{
 	PluginsModuleRep * self;
 	self = instance;
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1176,138 +1351,135 @@ void plugins_module_rep_unref (gpointer instance) {
 		PLUGINS_MODULE_REP_GET_CLASS (self)->finalize (self);
 #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1180 "Plugins.c"
+#line 1355 "Plugins.c"
 	}
 }
 
 
-PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type, SpitPluggable* pluggable) {
+PluginsPluggableRep*
+plugins_pluggable_rep_construct (GType object_type,
+                                 SpitPluggable* pluggable)
+{
 	PluginsPluggableRep* self = NULL;
-	SpitPluggable* _tmp0_;
-	SpitPluggable* _tmp1_;
-	const gchar* _tmp2_;
+	const gchar* _tmp0_;
 #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL);
 #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = (PluginsPluggableRep*) g_type_create_instance (object_type);
 #line 71 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = pluggable;
-#line 71 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	plugins_pluggable_rep_set_pluggable (self, _tmp0_);
+	plugins_pluggable_rep_set_pluggable (self, pluggable);
 #line 72 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = pluggable;
+	_tmp0_ = spit_pluggable_get_id (pluggable);
 #line 72 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = spit_pluggable_get_id (_tmp1_);
-#line 72 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	plugins_pluggable_rep_set_id (self, _tmp2_);
+	plugins_pluggable_rep_set_id (self, _tmp0_);
 #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self;
-#line 1206 "Plugins.c"
+#line 1378 "Plugins.c"
 }
 
 
-PluginsPluggableRep* plugins_pluggable_rep_new (SpitPluggable* pluggable) {
+PluginsPluggableRep*
+plugins_pluggable_rep_new (SpitPluggable* pluggable)
+{
 #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return plugins_pluggable_rep_construct (PLUGINS_TYPE_PLUGGABLE_REP, pluggable);
-#line 1213 "Plugins.c"
+#line 1387 "Plugins.c"
 }
 
 
-void plugins_pluggable_rep_activate (PluginsPluggableRep* self) {
+void
+plugins_pluggable_rep_activate (PluginsPluggableRep* self)
+{
 	SpitPluggable* _tmp0_;
-	gboolean _tmp1_;
 	FuzzyPropertyState saved_state = 0;
+	ConfigFacade* _tmp1_;
 	ConfigFacade* _tmp2_;
-	ConfigFacade* _tmp3_;
-	const gchar* _tmp4_;
-	FuzzyPropertyState _tmp5_;
-	FuzzyPropertyState _tmp6_;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_;
-	SpitPluggable* _tmp14_;
-	gboolean _tmp15_;
+	const gchar* _tmp3_;
+	FuzzyPropertyState _tmp4_;
+	gboolean _tmp5_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp7_;
+	SpitPluggable* _tmp12_;
+	gboolean _tmp13_;
 #line 75 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 78 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = self->priv->_pluggable;
 #line 78 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = plugins_is_core_pluggable (_tmp0_);
-#line 78 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	plugins_pluggable_rep_set_is_core (self, _tmp1_);
+	plugins_pluggable_rep_set_is_core (self, plugins_is_core_pluggable (_tmp0_));
 #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = config_facade_get_instance ();
+	_tmp1_ = config_facade_get_instance ();
 #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = _tmp2_;
-#line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = self->priv->_id;
+	_tmp2_ = _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp5_ = configuration_facade_is_plugin_enabled (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
+	_tmp3_ = self->priv->_id;
 #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = configuration_facade_is_plugin_enabled (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
 #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 80 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	saved_state = _tmp6_;
+	saved_state = _tmp4_;
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp9_ = self->priv->_is_core;
+	_tmp7_ = self->priv->_is_core;
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp9_) {
-#line 1257 "Plugins.c"
-		FuzzyPropertyState _tmp10_;
+	if (_tmp7_) {
+#line 1427 "Plugins.c"
+		FuzzyPropertyState _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp10_ = saved_state;
+		_tmp8_ = saved_state;
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp8_ = _tmp10_ != FUZZY_PROPERTY_STATE_DISABLED;
-#line 1263 "Plugins.c"
+		_tmp6_ = _tmp8_ != FUZZY_PROPERTY_STATE_DISABLED;
+#line 1433 "Plugins.c"
 	} else {
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp8_ = FALSE;
-#line 1267 "Plugins.c"
+		_tmp6_ = FALSE;
+#line 1437 "Plugins.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp8_) {
+	if (_tmp6_) {
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp7_ = TRUE;
-#line 1273 "Plugins.c"
+		_tmp5_ = TRUE;
+#line 1443 "Plugins.c"
 	} else {
-		gboolean _tmp11_ = FALSE;
-		gboolean _tmp12_;
+		gboolean _tmp9_ = FALSE;
+		gboolean _tmp10_;
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp12_ = self->priv->_is_core;
+		_tmp10_ = self->priv->_is_core;
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		if (!_tmp12_) {
-#line 1281 "Plugins.c"
-			FuzzyPropertyState _tmp13_;
+		if (!_tmp10_) {
+#line 1451 "Plugins.c"
+			FuzzyPropertyState _tmp11_;
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp13_ = saved_state;
+			_tmp11_ = saved_state;
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp11_ = _tmp13_ == FUZZY_PROPERTY_STATE_ENABLED;
-#line 1287 "Plugins.c"
+			_tmp9_ = _tmp11_ == FUZZY_PROPERTY_STATE_ENABLED;
+#line 1457 "Plugins.c"
 		} else {
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp11_ = FALSE;
-#line 1291 "Plugins.c"
+			_tmp9_ = FALSE;
+#line 1461 "Plugins.c"
 		}
 #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp7_ = _tmp11_;
-#line 1295 "Plugins.c"
+		_tmp5_ = _tmp9_;
+#line 1465 "Plugins.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->enabled = _tmp7_;
+	self->priv->enabled = _tmp5_;
 #line 85 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp14_ = self->priv->_pluggable;
+	_tmp12_ = self->priv->_pluggable;
 #line 85 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp15_ = self->priv->enabled;
+	_tmp13_ = self->priv->enabled;
 #line 85 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	spit_pluggable_activation (_tmp14_, _tmp15_);
+	spit_pluggable_activation (_tmp12_, _tmp13_);
 #line 87 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_pluggable_rep_set_activated (self, TRUE);
-#line 1307 "Plugins.c"
+#line 1477 "Plugins.c"
 }
 
 
-gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self) {
+gboolean
+plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1318,66 +1490,59 @@ gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 91 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1322 "Plugins.c"
+#line 1494 "Plugins.c"
 }
 
 
-gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean enabled) {
+gboolean
+plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self,
+                                   gboolean enabled)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	ConfigFacade* _tmp3_;
-	ConfigFacade* _tmp4_;
-	const gchar* _tmp5_;
-	gboolean _tmp6_;
-	SpitPluggable* _tmp7_;
-	gboolean _tmp8_;
+	ConfigFacade* _tmp1_;
+	ConfigFacade* _tmp2_;
+	const gchar* _tmp3_;
+	SpitPluggable* _tmp4_;
 #line 95 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE);
 #line 96 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = enabled;
-#line 96 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = self->priv->enabled;
+	_tmp0_ = self->priv->enabled;
 #line 96 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (enabled == _tmp0_) {
 #line 97 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		result = FALSE;
 #line 97 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return result;
-#line 1349 "Plugins.c"
+#line 1518 "Plugins.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = enabled;
-#line 99 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->enabled = _tmp2_;
+	self->priv->enabled = enabled;
 #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = config_facade_get_instance ();
+	_tmp1_ = config_facade_get_instance ();
 #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = _tmp3_;
-#line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp5_ = self->priv->_id;
+	_tmp2_ = _tmp1_;
 #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp6_ = enabled;
+	_tmp3_ = self->priv->_id;
 #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	configuration_facade_set_plugin_enabled (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp5_, _tmp6_);
+	configuration_facade_set_plugin_enabled (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_, enabled);
 #line 100 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp2_);
 #line 101 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp7_ = self->priv->_pluggable;
+	_tmp4_ = self->priv->_pluggable;
 #line 101 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp8_ = enabled;
-#line 101 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	spit_pluggable_activation (_tmp7_, _tmp8_);
+	spit_pluggable_activation (_tmp4_, enabled);
 #line 103 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = TRUE;
 #line 103 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1377 "Plugins.c"
+#line 1540 "Plugins.c"
 }
 
 
-SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self) {
+SpitPluggable*
+plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self)
+{
 	SpitPluggable* result;
 	SpitPluggable* _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1388,28 +1553,30 @@ SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1392 "Plugins.c"
+#line 1557 "Plugins.c"
 }
 
 
-static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, SpitPluggable* value) {
+static void
+plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self,
+                                     SpitPluggable* value)
+{
 	SpitPluggable* _tmp0_;
-	SpitPluggable* _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = value;
-#line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (value);
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_object_unref0 (self->priv->_pluggable);
 #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->_pluggable = _tmp1_;
-#line 1409 "Plugins.c"
+	self->priv->_pluggable = _tmp0_;
+#line 1574 "Plugins.c"
 }
 
 
-const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self) {
+const gchar*
+plugins_pluggable_rep_get_id (PluginsPluggableRep* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1420,28 +1587,30 @@ const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1424 "Plugins.c"
+#line 1591 "Plugins.c"
 }
 
 
-static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+plugins_pluggable_rep_set_id (PluginsPluggableRep* self,
+                              const gchar* value)
+{
+	gchar* _tmp0_;
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = value;
-#line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (self->priv->_id);
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->_id = _tmp1_;
-#line 1441 "Plugins.c"
+	self->priv->_id = _tmp0_;
+#line 1608 "Plugins.c"
 }
 
 
-gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self) {
+gboolean
+plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1452,23 +1621,25 @@ gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1456 "Plugins.c"
+#line 1625 "Plugins.c"
 }
 
 
-static void plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self, gboolean value) {
-	gboolean _tmp0_;
+static void
+plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self,
+                                   gboolean value)
+{
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = value;
-#line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->_is_core = _tmp0_;
-#line 1468 "Plugins.c"
+	self->priv->_is_core = value;
+#line 1637 "Plugins.c"
 }
 
 
-gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self) {
+gboolean
+plugins_pluggable_rep_get_activated (PluginsPluggableRep* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1479,120 +1650,145 @@ gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self) {
 	result = _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 1483 "Plugins.c"
+#line 1654 "Plugins.c"
 }
 
 
-static void plugins_pluggable_rep_set_activated (PluginsPluggableRep* self, gboolean value) {
-	gboolean _tmp0_;
+static void
+plugins_pluggable_rep_set_activated (PluginsPluggableRep* self,
+                                     gboolean value)
+{
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self));
 #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = value;
-#line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	self->priv->_activated = _tmp0_;
-#line 1495 "Plugins.c"
+	self->priv->_activated = value;
+#line 1666 "Plugins.c"
 }
 
 
-static void plugins_value_pluggable_rep_init (GValue* value) {
+static void
+plugins_value_pluggable_rep_init (GValue* value)
+{
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	value->data[0].v_pointer = NULL;
-#line 1502 "Plugins.c"
+#line 1675 "Plugins.c"
 }
 
 
-static void plugins_value_pluggable_rep_free_value (GValue* value) {
+static void
+plugins_value_pluggable_rep_free_value (GValue* value)
+{
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_pluggable_rep_unref (value->data[0].v_pointer);
-#line 1511 "Plugins.c"
+#line 1686 "Plugins.c"
 	}
 }
 
 
-static void plugins_value_pluggable_rep_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+plugins_value_pluggable_rep_copy_value (const GValue* src_value,
+                                        GValue* dest_value)
+{
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (src_value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = plugins_pluggable_rep_ref (src_value->data[0].v_pointer);
-#line 1521 "Plugins.c"
+#line 1699 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1525 "Plugins.c"
+#line 1703 "Plugins.c"
 	}
 }
 
 
-static gpointer plugins_value_pluggable_rep_peek_pointer (const GValue* value) {
+static gpointer
+plugins_value_pluggable_rep_peek_pointer (const GValue* value)
+{
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 1533 "Plugins.c"
+#line 1713 "Plugins.c"
 }
 
 
-static gchar* plugins_value_pluggable_rep_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+plugins_value_pluggable_rep_collect_value (GValue* value,
+                                           guint n_collect_values,
+                                           GTypeCValue* collect_values,
+                                           guint collect_flags)
+{
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (collect_values[0].v_pointer) {
-#line 1540 "Plugins.c"
+#line 1725 "Plugins.c"
 		PluginsPluggableRep * object;
 		object = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1547 "Plugins.c"
+#line 1732 "Plugins.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1551 "Plugins.c"
+#line 1736 "Plugins.c"
 		}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = plugins_pluggable_rep_ref (object);
-#line 1555 "Plugins.c"
+#line 1740 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1559 "Plugins.c"
+#line 1744 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 1563 "Plugins.c"
+#line 1748 "Plugins.c"
 }
 
 
-static gchar* plugins_value_pluggable_rep_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+plugins_value_pluggable_rep_lcopy_value (const GValue* value,
+                                         guint n_collect_values,
+                                         GTypeCValue* collect_values,
+                                         guint collect_flags)
+{
 	PluginsPluggableRep ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!object_p) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1574 "Plugins.c"
+#line 1764 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = NULL;
-#line 1580 "Plugins.c"
+#line 1770 "Plugins.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1584 "Plugins.c"
+#line 1774 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = plugins_pluggable_rep_ref (value->data[0].v_pointer);
-#line 1588 "Plugins.c"
+#line 1778 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 1592 "Plugins.c"
+#line 1782 "Plugins.c"
 }
 
 
-GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+plugins_param_spec_pluggable_rep (const gchar* name,
+                                  const gchar* nick,
+                                  const gchar* blurb,
+                                  GType object_type,
+                                  GParamFlags flags)
+{
 	PluginsParamSpecPluggableRep* spec;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PLUGINS_TYPE_PLUGGABLE_REP), NULL);
@@ -1602,20 +1798,25 @@ GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* ni
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return G_PARAM_SPEC (spec);
-#line 1606 "Plugins.c"
+#line 1802 "Plugins.c"
 }
 
 
-gpointer plugins_value_get_pluggable_rep (const GValue* value) {
+gpointer
+plugins_value_get_pluggable_rep (const GValue* value)
+{
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP), NULL);
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 1615 "Plugins.c"
+#line 1813 "Plugins.c"
 }
 
 
-void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object) {
+void
+plugins_value_set_pluggable_rep (GValue* value,
+                                 gpointer v_object)
+{
 	PluginsPluggableRep * old;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP));
@@ -1631,22 +1832,25 @@ void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_pluggable_rep_ref (value->data[0].v_pointer);
-#line 1635 "Plugins.c"
+#line 1836 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1639 "Plugins.c"
+#line 1840 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_pluggable_rep_unref (old);
-#line 1645 "Plugins.c"
+#line 1846 "Plugins.c"
 	}
 }
 
 
-void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object) {
+void
+plugins_value_take_pluggable_rep (GValue* value,
+                                  gpointer v_object)
+{
 	PluginsPluggableRep * old;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP));
@@ -1660,33 +1864,37 @@ void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = v_object;
-#line 1664 "Plugins.c"
+#line 1868 "Plugins.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 1668 "Plugins.c"
+#line 1872 "Plugins.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_pluggable_rep_unref (old);
-#line 1674 "Plugins.c"
+#line 1878 "Plugins.c"
 	}
 }
 
 
-static void plugins_pluggable_rep_class_init (PluginsPluggableRepClass * klass) {
+static void
+plugins_pluggable_rep_class_init (PluginsPluggableRepClass * klass)
+{
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_pluggable_rep_parent_class = g_type_class_peek_parent (klass);
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	((PluginsPluggableRepClass *) klass)->finalize = plugins_pluggable_rep_finalize;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_type_class_add_private (klass, sizeof (PluginsPluggableRepPrivate));
-#line 1686 "Plugins.c"
+#line 1892 "Plugins.c"
 }
 
 
-static void plugins_pluggable_rep_instance_init (PluginsPluggableRep * self) {
+static void
+plugins_pluggable_rep_instance_init (PluginsPluggableRep * self)
+{
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->priv = PLUGINS_PLUGGABLE_REP_GET_PRIVATE (self);
 #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1697,11 +1905,13 @@ static void plugins_pluggable_rep_instance_init (PluginsPluggableRep * self) {
 	self->priv->enabled = FALSE;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->ref_count = 1;
-#line 1701 "Plugins.c"
+#line 1909 "Plugins.c"
 }
 
 
-static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj) {
+static void
+plugins_pluggable_rep_finalize (PluginsPluggableRep * obj)
+{
 	PluginsPluggableRep * self;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_PLUGGABLE_REP, PluginsPluggableRep);
@@ -1711,11 +1921,13 @@ static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj) {
 	_g_object_unref0 (self->priv->_pluggable);
 #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (self->priv->_id);
-#line 1715 "Plugins.c"
+#line 1925 "Plugins.c"
 }
 
 
-GType plugins_pluggable_rep_get_type (void) {
+GType
+plugins_pluggable_rep_get_type (void)
+{
 	static volatile gsize plugins_pluggable_rep_type_id__volatile = 0;
 	if (g_once_init_enter (&plugins_pluggable_rep_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { plugins_value_pluggable_rep_init, plugins_value_pluggable_rep_free_value, plugins_value_pluggable_rep_copy_value, plugins_value_pluggable_rep_peek_pointer, "p", plugins_value_pluggable_rep_collect_value, "p", plugins_value_pluggable_rep_lcopy_value };
@@ -1729,18 +1941,22 @@ GType plugins_pluggable_rep_get_type (void) {
 }
 
 
-gpointer plugins_pluggable_rep_ref (gpointer instance) {
+gpointer
+plugins_pluggable_rep_ref (gpointer instance)
+{
 	PluginsPluggableRep * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return instance;
-#line 1740 "Plugins.c"
+#line 1954 "Plugins.c"
 }
 
 
-void plugins_pluggable_rep_unref (gpointer instance) {
+void
+plugins_pluggable_rep_unref (gpointer instance)
+{
 	PluginsPluggableRep * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1749,46 +1965,58 @@ void plugins_pluggable_rep_unref (gpointer instance) {
 		PLUGINS_PLUGGABLE_REP_GET_CLASS (self)->finalize (self);
 #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1753 "Plugins.c"
+#line 1969 "Plugins.c"
 	}
 }
 
 
-static void _vala_array_add50 (GFile** * array, int* length, int* size, GFile* value) {
+static void
+_vala_array_add50 (GFile** * array,
+                   int* length,
+                   int* size,
+                   GFile* value)
+{
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if ((*length) == (*size)) {
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*array = g_renew (GFile*, *array, (*size) + 1);
-#line 1765 "Plugins.c"
+#line 1986 "Plugins.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	(*array)[(*length)++] = value;
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	(*array)[*length] = NULL;
-#line 1771 "Plugins.c"
+#line 1992 "Plugins.c"
 }
 
 
-static void _vala_array_add51 (GFile** * array, int* length, int* size, GFile* value) {
+static void
+_vala_array_add51 (GFile** * array,
+                   int* length,
+                   int* size,
+                   GFile* value)
+{
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if ((*length) == (*size)) {
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*array = g_renew (GFile*, *array, (*size) + 1);
-#line 1782 "Plugins.c"
+#line 2008 "Plugins.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	(*array)[(*length)++] = value;
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	(*array)[*length] = NULL;
-#line 1788 "Plugins.c"
+#line 2014 "Plugins.c"
 }
 
 
-void plugins_init (GError** error) {
+void
+plugins_init (GError** error)
+{
 	GFile** _tmp0_;
 	GFile** _tmp1_;
 	gint _tmp1__length1;
@@ -1800,9 +2028,8 @@ void plugins_init (GError** error) {
 	GeeHashMap* _tmp6_;
 	GeeHashMap* _tmp7_;
 	GeeHashSet* _tmp8_;
-	gboolean _tmp9_;
-	GFile** _tmp10_;
-	gint _tmp10__length1;
+	GFile** _tmp9_;
+	gint _tmp9__length1;
 	GError * _inner_error_ = NULL;
 #line 114 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = g_new0 (GFile*, 0 + 1);
@@ -1855,50 +2082,48 @@ void plugins_init (GError** error) {
 #line 121 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_core_ids = _tmp8_;
 #line 125 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp9_ = g_module_supported ();
-#line 125 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (!_tmp9_) {
+	if (!g_module_supported ()) {
 #line 126 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_warning ("Plugins.vala:126: Plugins not support: GModule not supported on this p" \
 "latform.");
 #line 128 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 1866 "Plugins.c"
+#line 2091 "Plugins.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp10_ = plugins_search_dirs;
+	_tmp9_ = plugins_search_dirs;
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp10__length1 = plugins_search_dirs_length1;
-#line 1872 "Plugins.c"
+	_tmp9__length1 = plugins_search_dirs_length1;
+#line 2097 "Plugins.c"
 	{
 		GFile** dir_collection = NULL;
 		gint dir_collection_length1 = 0;
 		gint _dir_collection_size_ = 0;
 		gint dir_it = 0;
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		dir_collection = _tmp10_;
+		dir_collection = _tmp9_;
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		dir_collection_length1 = _tmp10__length1;
+		dir_collection_length1 = _tmp9__length1;
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		for (dir_it = 0; dir_it < _tmp10__length1; dir_it = dir_it + 1) {
-#line 1884 "Plugins.c"
-			GFile* _tmp11_;
+		for (dir_it = 0; dir_it < _tmp9__length1; dir_it = dir_it + 1) {
+#line 2109 "Plugins.c"
+			GFile* _tmp10_;
 			GFile* dir = NULL;
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp11_ = _g_object_ref0 (dir_collection[dir_it]);
+			_tmp10_ = _g_object_ref0 (dir_collection[dir_it]);
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			dir = _tmp11_;
-#line 1891 "Plugins.c"
+			dir = _tmp10_;
+#line 2116 "Plugins.c"
 			{
 				{
-					GFile* _tmp12_;
+					GFile* _tmp11_;
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp12_ = dir;
+					_tmp11_ = dir;
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					plugins_search_for_plugins (_tmp12_, &_inner_error_);
+					plugins_search_for_plugins (_tmp11_, &_inner_error_);
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1901 "Plugins.c"
+#line 2126 "Plugins.c"
 						goto __catch39_g_error;
 					}
 				}
@@ -1906,32 +2131,32 @@ void plugins_init (GError** error) {
 				__catch39_g_error:
 				{
 					GError* err = NULL;
-					GFile* _tmp13_;
+					GFile* _tmp12_;
+					gchar* _tmp13_;
 					gchar* _tmp14_;
-					gchar* _tmp15_;
-					GError* _tmp16_;
-					const gchar* _tmp17_;
+					GError* _tmp15_;
+					const gchar* _tmp16_;
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					err = _inner_error_;
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_inner_error_ = NULL;
 #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp13_ = dir;
+					_tmp12_ = dir;
 #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp14_ = g_file_get_path (_tmp13_);
+					_tmp13_ = g_file_get_path (_tmp12_);
 #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp15_ = _tmp14_;
+					_tmp14_ = _tmp13_;
 #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp16_ = err;
+					_tmp15_ = err;
 #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp17_ = _tmp16_->message;
+					_tmp16_ = _tmp15_->message;
 #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					g_debug ("Plugins.vala:135: Unable to search directory %s for plugins: %s", _tmp15_, _tmp17_);
+					g_debug ("Plugins.vala:135: Unable to search directory %s for plugins: %s", _tmp14_, _tmp16_);
 #line 135 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_g_free0 (_tmp15_);
+					_g_free0 (_tmp14_);
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_g_error_free0 (err);
-#line 1934 "Plugins.c"
+#line 2159 "Plugins.c"
 				}
 				__finally39:
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1942,18 +2167,20 @@ void plugins_init (GError** error) {
 					_g_object_unref0 (dir);
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					return;
-#line 1945 "Plugins.c"
+#line 2170 "Plugins.c"
 				}
 #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_g_object_unref0 (dir);
-#line 1949 "Plugins.c"
+#line 2174 "Plugins.c"
 			}
 		}
 	}
 }
 
 
-void plugins_terminate (void) {
+void
+plugins_terminate (void)
+{
 #line 141 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_search_dirs = (_vala_array_free (plugins_search_dirs, plugins_search_dirs_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 141 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1978,35 +2205,43 @@ void plugins_terminate (void) {
 	_g_object_unref0 (plugins_core_ids);
 #line 145 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_core_ids = NULL;
-#line 1981 "Plugins.c"
+#line 2208 "Plugins.c"
 }
 
 
-static PluginsNotifier* plugins_notifier_construct (GType object_type) {
+static PluginsNotifier*
+plugins_notifier_construct (GType object_type)
+{
 	PluginsNotifier* self = NULL;
 #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = (PluginsNotifier*) g_type_create_instance (object_type);
 #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self;
-#line 1991 "Plugins.c"
+#line 2220 "Plugins.c"
 }
 
 
-static PluginsNotifier* plugins_notifier_new (void) {
+static PluginsNotifier*
+plugins_notifier_new (void)
+{
 #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return plugins_notifier_construct (PLUGINS_TYPE_NOTIFIER);
-#line 1998 "Plugins.c"
+#line 2229 "Plugins.c"
 }
 
 
-static gpointer _plugins_notifier_ref0 (gpointer self) {
+static gpointer
+_plugins_notifier_ref0 (gpointer self)
+{
 #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return self ? plugins_notifier_ref (self) : NULL;
-#line 2005 "Plugins.c"
+#line 2238 "Plugins.c"
 }
 
 
-PluginsNotifier* plugins_notifier_get_instance (void) {
+PluginsNotifier*
+plugins_notifier_get_instance (void)
+{
 	PluginsNotifier* result = NULL;
 	PluginsNotifier* _tmp0_;
 	PluginsNotifier* _tmp2_;
@@ -2015,7 +2250,7 @@ PluginsNotifier* plugins_notifier_get_instance (void) {
 	_tmp0_ = plugins_notifier_instance;
 #line 157 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp0_ == NULL) {
-#line 2018 "Plugins.c"
+#line 2253 "Plugins.c"
 		PluginsNotifier* _tmp1_;
 #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp1_ = plugins_notifier_new ();
@@ -2023,7 +2258,7 @@ PluginsNotifier* plugins_notifier_get_instance (void) {
 		_plugins_notifier_unref0 (plugins_notifier_instance);
 #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_instance = _tmp1_;
-#line 2026 "Plugins.c"
+#line 2261 "Plugins.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp2_ = plugins_notifier_instance;
@@ -2033,11 +2268,18 @@ PluginsNotifier* plugins_notifier_get_instance (void) {
 	result = _tmp3_;
 #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2036 "Plugins.c"
+#line 2271 "Plugins.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure,
+                                              GValue * return_value,
+                                              guint n_param_values,
+                                              const GValue * param_values,
+                                              gpointer invocation_hint,
+                                              gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__OBJECT_BOOLEAN) (gpointer data1, gpointer arg_1, gboolean arg_2, gpointer data2);
 	register GMarshalFunc_VOID__OBJECT_BOOLEAN callback;
 	register GCClosure * cc;
@@ -2052,120 +2294,145 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV
 		data1 = closure->data;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2055 "Plugins.c"
+#line 2297 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		data2 = closure->data;
-#line 2061 "Plugins.c"
+#line 2303 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 2067 "Plugins.c"
+#line 2309 "Plugins.c"
 }
 
 
-static void plugins_value_notifier_init (GValue* value) {
+static void
+plugins_value_notifier_init (GValue* value)
+{
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	value->data[0].v_pointer = NULL;
-#line 2074 "Plugins.c"
+#line 2318 "Plugins.c"
 }
 
 
-static void plugins_value_notifier_free_value (GValue* value) {
+static void
+plugins_value_notifier_free_value (GValue* value)
+{
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (value->data[0].v_pointer) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_unref (value->data[0].v_pointer);
-#line 2083 "Plugins.c"
+#line 2329 "Plugins.c"
 	}
 }
 
 
-static void plugins_value_notifier_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+plugins_value_notifier_copy_value (const GValue* src_value,
+                                   GValue* dest_value)
+{
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (src_value->data[0].v_pointer) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = plugins_notifier_ref (src_value->data[0].v_pointer);
-#line 2093 "Plugins.c"
+#line 2342 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2097 "Plugins.c"
+#line 2346 "Plugins.c"
 	}
 }
 
 
-static gpointer plugins_value_notifier_peek_pointer (const GValue* value) {
+static gpointer
+plugins_value_notifier_peek_pointer (const GValue* value)
+{
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 2105 "Plugins.c"
+#line 2356 "Plugins.c"
 }
 
 
-static gchar* plugins_value_notifier_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+plugins_value_notifier_collect_value (GValue* value,
+                                      guint n_collect_values,
+                                      GTypeCValue* collect_values,
+                                      guint collect_flags)
+{
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (collect_values[0].v_pointer) {
-#line 2112 "Plugins.c"
+#line 2368 "Plugins.c"
 		PluginsNotifier * object;
 		object = collect_values[0].v_pointer;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2119 "Plugins.c"
+#line 2375 "Plugins.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2123 "Plugins.c"
+#line 2379 "Plugins.c"
 		}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = plugins_notifier_ref (object);
-#line 2127 "Plugins.c"
+#line 2383 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 2131 "Plugins.c"
+#line 2387 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 2135 "Plugins.c"
+#line 2391 "Plugins.c"
 }
 
 
-static gchar* plugins_value_notifier_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+plugins_value_notifier_lcopy_value (const GValue* value,
+                                    guint n_collect_values,
+                                    GTypeCValue* collect_values,
+                                    guint collect_flags)
+{
 	PluginsNotifier ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!object_p) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2146 "Plugins.c"
+#line 2407 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!value->data[0].v_pointer) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = NULL;
-#line 2152 "Plugins.c"
+#line 2413 "Plugins.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2156 "Plugins.c"
+#line 2417 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*object_p = plugins_notifier_ref (value->data[0].v_pointer);
-#line 2160 "Plugins.c"
+#line 2421 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return NULL;
-#line 2164 "Plugins.c"
+#line 2425 "Plugins.c"
 }
 
 
-GParamSpec* plugins_param_spec_notifier (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+plugins_param_spec_notifier (const gchar* name,
+                             const gchar* nick,
+                             const gchar* blurb,
+                             GType object_type,
+                             GParamFlags flags)
+{
 	PluginsParamSpecNotifier* spec;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PLUGINS_TYPE_NOTIFIER), NULL);
@@ -2175,20 +2442,25 @@ GParamSpec* plugins_param_spec_notifier (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return G_PARAM_SPEC (spec);
-#line 2178 "Plugins.c"
+#line 2445 "Plugins.c"
 }
 
 
-gpointer plugins_value_get_notifier (const GValue* value) {
+gpointer
+plugins_value_get_notifier (const GValue* value)
+{
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER), NULL);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return value->data[0].v_pointer;
-#line 2187 "Plugins.c"
+#line 2456 "Plugins.c"
 }
 
 
-void plugins_value_set_notifier (GValue* value, gpointer v_object) {
+void
+plugins_value_set_notifier (GValue* value,
+                            gpointer v_object)
+{
 	PluginsNotifier * old;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER));
@@ -2204,22 +2476,25 @@ void plugins_value_set_notifier (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_ref (value->data[0].v_pointer);
-#line 2207 "Plugins.c"
+#line 2479 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 2211 "Plugins.c"
+#line 2483 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_unref (old);
-#line 2217 "Plugins.c"
+#line 2489 "Plugins.c"
 	}
 }
 
 
-void plugins_value_take_notifier (GValue* value, gpointer v_object) {
+void
+plugins_value_take_notifier (GValue* value,
+                             gpointer v_object)
+{
 	PluginsNotifier * old;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER));
@@ -2233,50 +2508,58 @@ void plugins_value_take_notifier (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = v_object;
-#line 2236 "Plugins.c"
+#line 2511 "Plugins.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		value->data[0].v_pointer = NULL;
-#line 2240 "Plugins.c"
+#line 2515 "Plugins.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (old) {
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		plugins_notifier_unref (old);
-#line 2246 "Plugins.c"
+#line 2521 "Plugins.c"
 	}
 }
 
 
-static void plugins_notifier_class_init (PluginsNotifierClass * klass) {
+static void
+plugins_notifier_class_init (PluginsNotifierClass * klass)
+{
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_notifier_parent_class = g_type_class_peek_parent (klass);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	((PluginsNotifierClass *) klass)->finalize = plugins_notifier_finalize;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL] = g_signal_new ("pluggable-activation", PLUGINS_TYPE_NOTIFIER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SPIT_TYPE_PLUGGABLE, G_TYPE_BOOLEAN);
-#line 2258 "Plugins.c"
+#line 2535 "Plugins.c"
 }
 
 
-static void plugins_notifier_instance_init (PluginsNotifier * self) {
+static void
+plugins_notifier_instance_init (PluginsNotifier * self)
+{
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self->ref_count = 1;
-#line 2265 "Plugins.c"
+#line 2544 "Plugins.c"
 }
 
 
-static void plugins_notifier_finalize (PluginsNotifier * obj) {
+static void
+plugins_notifier_finalize (PluginsNotifier * obj)
+{
 	PluginsNotifier * self;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_NOTIFIER, PluginsNotifier);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_signal_handlers_destroy (self);
-#line 2275 "Plugins.c"
+#line 2556 "Plugins.c"
 }
 
 
-GType plugins_notifier_get_type (void) {
+GType
+plugins_notifier_get_type (void)
+{
 	static volatile gsize plugins_notifier_type_id__volatile = 0;
 	if (g_once_init_enter (&plugins_notifier_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { plugins_value_notifier_init, plugins_value_notifier_free_value, plugins_value_notifier_copy_value, plugins_value_notifier_peek_pointer, "p", plugins_value_notifier_collect_value, "p", plugins_value_notifier_lcopy_value };
@@ -2290,18 +2573,22 @@ GType plugins_notifier_get_type (void) {
 }
 
 
-gpointer plugins_notifier_ref (gpointer instance) {
+gpointer
+plugins_notifier_ref (gpointer instance)
+{
 	PluginsNotifier * self;
 	self = instance;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return instance;
-#line 2300 "Plugins.c"
+#line 2585 "Plugins.c"
 }
 
 
-void plugins_notifier_unref (gpointer instance) {
+void
+plugins_notifier_unref (gpointer instance)
+{
 	PluginsNotifier * self;
 	self = instance;
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2310,223 +2597,179 @@ void plugins_notifier_unref (gpointer instance) {
 		PLUGINS_NOTIFIER_GET_CLASS (self)->finalize (self);
 #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2313 "Plugins.c"
+#line 2600 "Plugins.c"
 	}
 }
 
 
-void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) {
+void
+plugins_register_extension_point (GType type,
+                                  const gchar* name,
+                                  const gchar* icon_name,
+                                  gchar** core_ids,
+                                  int core_ids_length1)
+{
 	GeeHashMap* _tmp0_;
-	GType _tmp1_;
-	gboolean _tmp2_;
-	GeeHashMap* _tmp3_;
-	GType _tmp4_;
-	GType _tmp5_;
-	const gchar* _tmp6_;
-	const gchar* _tmp7_;
-	gchar** _tmp8_;
-	gint _tmp8__length1;
-	PluginsExtensionPoint* _tmp9_;
-	PluginsExtensionPoint* _tmp10_;
-	gchar** _tmp11_;
-	gint _tmp11__length1;
+	GeeHashMap* _tmp1_;
+	PluginsExtensionPoint* _tmp2_;
+	PluginsExtensionPoint* _tmp3_;
 #line 164 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (name != NULL);
 #line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = plugins_extension_points;
 #line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = type;
-#line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp1_));
-#line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_vala_assert (!_tmp2_, "!extension_points.has_key(type)");
-#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = plugins_extension_points;
-#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = type;
-#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp5_ = type;
+	_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) type)), "!extension_points.has_key(type)");
 #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp6_ = name;
+	_tmp1_ = plugins_extension_points;
 #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp7_ = icon_name;
+	_tmp2_ = plugins_extension_point_new (type, name, icon_name, core_ids, core_ids_length1);
 #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp8_ = core_ids;
-#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp8__length1 = core_ids_length1;
-#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp9_ = plugins_extension_point_new (_tmp5_, _tmp6_, _tmp7_, _tmp8_, _tmp8__length1);
-#line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp10_ = _tmp9_;
+	_tmp3_ = _tmp2_;
 #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp4_), _tmp10_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) type), _tmp3_);
 #line 168 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_plugins_extension_point_unref0 (_tmp10_);
-#line 171 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp11_ = core_ids;
+	_plugins_extension_point_unref0 (_tmp3_);
 #line 171 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp11__length1 = core_ids_length1;
-#line 171 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp11_ != NULL) {
-#line 2371 "Plugins.c"
-		gchar** _tmp12_;
-		gint _tmp12__length1;
-#line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp12_ = core_ids;
-#line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp12__length1 = core_ids_length1;
-#line 2378 "Plugins.c"
+	if (core_ids != NULL) {
+#line 2634 "Plugins.c"
 		{
 			gchar** core_id_collection = NULL;
 			gint core_id_collection_length1 = 0;
 			gint _core_id_collection_size_ = 0;
 			gint core_id_it = 0;
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			core_id_collection = _tmp12_;
+			core_id_collection = core_ids;
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			core_id_collection_length1 = _tmp12__length1;
+			core_id_collection_length1 = core_ids_length1;
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			for (core_id_it = 0; core_id_it < _tmp12__length1; core_id_it = core_id_it + 1) {
-#line 2390 "Plugins.c"
-				gchar* _tmp13_;
+			for (core_id_it = 0; core_id_it < core_ids_length1; core_id_it = core_id_it + 1) {
+#line 2646 "Plugins.c"
+				gchar* _tmp4_;
 				gchar* core_id = NULL;
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp13_ = g_strdup (core_id_collection[core_id_it]);
+				_tmp4_ = g_strdup (core_id_collection[core_id_it]);
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				core_id = _tmp13_;
-#line 2397 "Plugins.c"
+				core_id = _tmp4_;
+#line 2653 "Plugins.c"
 				{
-					GeeHashSet* _tmp14_;
-					const gchar* _tmp15_;
+					GeeHashSet* _tmp5_;
+					const gchar* _tmp6_;
 #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp14_ = plugins_core_ids;
+					_tmp5_ = plugins_core_ids;
 #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp15_ = core_id;
+					_tmp6_ = core_id;
 #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
+					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
 #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_g_free0 (core_id);
-#line 2409 "Plugins.c"
+#line 2665 "Plugins.c"
 				}
 			}
 		}
 	}
 	{
 		GeeIterator* _pluggable_rep_it = NULL;
-		GeeHashMap* _tmp16_;
-		GeeCollection* _tmp17_;
-		GeeCollection* _tmp18_;
-		GeeCollection* _tmp19_;
-		GeeIterator* _tmp20_;
-		GeeIterator* _tmp21_;
+		GeeHashMap* _tmp7_;
+		GeeCollection* _tmp8_;
+		GeeCollection* _tmp9_;
+		GeeCollection* _tmp10_;
+		GeeIterator* _tmp11_;
+		GeeIterator* _tmp12_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp16_ = plugins_pluggable_table;
+		_tmp7_ = plugins_pluggable_table;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp17_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+		_tmp8_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp18_ = _tmp17_;
+		_tmp9_ = _tmp8_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp19_ = _tmp18_;
+		_tmp10_ = _tmp9_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp21_ = _tmp20_;
+		_tmp12_ = _tmp11_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_object_unref0 (_tmp19_);
+		_g_object_unref0 (_tmp10_);
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_pluggable_rep_it = _tmp21_;
+		_pluggable_rep_it = _tmp12_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 2440 "Plugins.c"
-			GeeIterator* _tmp22_;
-			gboolean _tmp23_;
+#line 2696 "Plugins.c"
+			GeeIterator* _tmp13_;
 			PluginsPluggableRep* pluggable_rep = NULL;
-			GeeIterator* _tmp24_;
-			gpointer _tmp25_;
-			PluginsPluggableRep* _tmp26_;
-			SpitPluggable* _tmp27_;
-			SpitPluggable* _tmp28_;
-			GType _tmp29_;
-			GType _tmp30_;
-			gboolean _tmp31_;
-			PluginsPluggableRep* _tmp32_;
-			PluginsNotifier* _tmp33_;
-			PluginsNotifier* _tmp34_;
-			PluginsPluggableRep* _tmp35_;
-			SpitPluggable* _tmp36_;
-			SpitPluggable* _tmp37_;
-			PluginsPluggableRep* _tmp38_;
-			gboolean _tmp39_;
-#line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp22_ = _pluggable_rep_it;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
+			PluginsPluggableRep* _tmp16_;
+			SpitPluggable* _tmp17_;
+			SpitPluggable* _tmp18_;
+			PluginsPluggableRep* _tmp19_;
+			PluginsNotifier* _tmp20_;
+			PluginsNotifier* _tmp21_;
+			PluginsPluggableRep* _tmp22_;
+			SpitPluggable* _tmp23_;
+			SpitPluggable* _tmp24_;
+			PluginsPluggableRep* _tmp25_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp23_ = gee_iterator_next (_tmp22_);
+			_tmp13_ = _pluggable_rep_it;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (!_tmp23_) {
+			if (!gee_iterator_next (_tmp13_)) {
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 2468 "Plugins.c"
+#line 2717 "Plugins.c"
 			}
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp24_ = _pluggable_rep_it;
+			_tmp14_ = _pluggable_rep_it;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp25_ = gee_iterator_get (_tmp24_);
+			_tmp15_ = gee_iterator_get (_tmp14_);
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			pluggable_rep = (PluginsPluggableRep*) _tmp25_;
-#line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp26_ = pluggable_rep;
-#line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp27_ = plugins_pluggable_rep_get_pluggable (_tmp26_);
+			pluggable_rep = (PluginsPluggableRep*) _tmp15_;
 #line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp28_ = _tmp27_;
+			_tmp16_ = pluggable_rep;
 #line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp29_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, G_TYPE_OBJECT, GObject));
+			_tmp17_ = plugins_pluggable_rep_get_pluggable (_tmp16_);
 #line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp30_ = type;
+			_tmp18_ = _tmp17_;
 #line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp31_ = g_type_is_a (_tmp29_, _tmp30_);
-#line 178 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (!_tmp31_) {
+			if (!g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OBJECT, GObject)), type)) {
 #line 179 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 179 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				continue;
-#line 2494 "Plugins.c"
+#line 2737 "Plugins.c"
 			}
 #line 181 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp32_ = pluggable_rep;
+			_tmp19_ = pluggable_rep;
 #line 181 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			plugins_pluggable_rep_activate (_tmp32_);
-#line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp33_ = plugins_notifier_get_instance ();
+			plugins_pluggable_rep_activate (_tmp19_);
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp34_ = _tmp33_;
+			_tmp20_ = plugins_notifier_get_instance ();
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp35_ = pluggable_rep;
+			_tmp21_ = _tmp20_;
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp36_ = plugins_pluggable_rep_get_pluggable (_tmp35_);
+			_tmp22_ = pluggable_rep;
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp37_ = _tmp36_;
+			_tmp23_ = plugins_pluggable_rep_get_pluggable (_tmp22_);
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp38_ = pluggable_rep;
+			_tmp24_ = _tmp23_;
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp39_ = plugins_pluggable_rep_is_enabled (_tmp38_);
+			_tmp25_ = pluggable_rep;
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			g_signal_emit (_tmp34_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp37_, _tmp39_);
+			g_signal_emit (_tmp21_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp24_, plugins_pluggable_rep_is_enabled (_tmp25_));
 #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_plugins_notifier_unref0 (_tmp34_);
+			_plugins_notifier_unref0 (_tmp21_);
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 2520 "Plugins.c"
+#line 2761 "Plugins.c"
 		}
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_pluggable_rep_it);
-#line 2524 "Plugins.c"
+#line 2765 "Plugins.c"
 	}
 }
 
 
-GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
+GeeCollection*
+plugins_get_pluggables (gboolean include_disabled)
+{
 	GeeCollection* result = NULL;
 	GeeCollection* all = NULL;
 	GeeHashSet* _tmp0_;
@@ -2534,7 +2777,7 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
 	_tmp0_ = gee_hash_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 187 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	all = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2537 "Plugins.c"
+#line 2780 "Plugins.c"
 	{
 		GeeIterator* _pluggable_rep_it = NULL;
 		GeeHashMap* _tmp1_;
@@ -2561,154 +2804,146 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
 		_pluggable_rep_it = _tmp6_;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 2564 "Plugins.c"
+#line 2807 "Plugins.c"
 			GeeIterator* _tmp7_;
-			gboolean _tmp8_;
 			PluginsPluggableRep* pluggable_rep = NULL;
-			GeeIterator* _tmp9_;
-			gpointer _tmp10_;
-			gboolean _tmp11_ = FALSE;
-			PluginsPluggableRep* _tmp12_;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			gboolean _tmp10_ = FALSE;
+			PluginsPluggableRep* _tmp11_;
+			gboolean _tmp12_;
 			gboolean _tmp13_;
-			gboolean _tmp14_;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp7_ = _pluggable_rep_it;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (!_tmp8_) {
+			if (!gee_iterator_next (_tmp7_)) {
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 2582 "Plugins.c"
+#line 2822 "Plugins.c"
 			}
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp9_ = _pluggable_rep_it;
+			_tmp8_ = _pluggable_rep_it;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp10_ = gee_iterator_get (_tmp9_);
+			_tmp9_ = gee_iterator_get (_tmp8_);
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			pluggable_rep = (PluginsPluggableRep*) _tmp10_;
+			pluggable_rep = (PluginsPluggableRep*) _tmp9_;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp12_ = pluggable_rep;
+			_tmp11_ = pluggable_rep;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp13_ = plugins_pluggable_rep_get_activated (_tmp12_);
+			_tmp12_ = plugins_pluggable_rep_get_activated (_tmp11_);
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp14_ = _tmp13_;
+			_tmp13_ = _tmp12_;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (_tmp14_) {
-#line 2598 "Plugins.c"
-				gboolean _tmp15_ = FALSE;
-				gboolean _tmp16_;
+			if (_tmp13_) {
+#line 2838 "Plugins.c"
+				gboolean _tmp14_ = FALSE;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp16_ = include_disabled;
+				if (include_disabled) {
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				if (_tmp16_) {
-#line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp15_ = TRUE;
-#line 2607 "Plugins.c"
+					_tmp14_ = TRUE;
+#line 2844 "Plugins.c"
 				} else {
-					PluginsPluggableRep* _tmp17_;
-					gboolean _tmp18_;
-#line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp17_ = pluggable_rep;
+					PluginsPluggableRep* _tmp15_;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp18_ = plugins_pluggable_rep_is_enabled (_tmp17_);
+					_tmp15_ = pluggable_rep;
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp15_ = _tmp18_;
-#line 2617 "Plugins.c"
+					_tmp14_ = plugins_pluggable_rep_is_enabled (_tmp15_);
+#line 2851 "Plugins.c"
 				}
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp11_ = _tmp15_;
-#line 2621 "Plugins.c"
+				_tmp10_ = _tmp14_;
+#line 2855 "Plugins.c"
 			} else {
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp11_ = FALSE;
-#line 2625 "Plugins.c"
+				_tmp10_ = FALSE;
+#line 2859 "Plugins.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (_tmp11_) {
-#line 2629 "Plugins.c"
-				GeeCollection* _tmp19_;
-				PluginsPluggableRep* _tmp20_;
-				SpitPluggable* _tmp21_;
-				SpitPluggable* _tmp22_;
+			if (_tmp10_) {
+#line 2863 "Plugins.c"
+				GeeCollection* _tmp16_;
+				PluginsPluggableRep* _tmp17_;
+				SpitPluggable* _tmp18_;
+				SpitPluggable* _tmp19_;
 #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp19_ = all;
+				_tmp16_ = all;
 #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp20_ = pluggable_rep;
+				_tmp17_ = pluggable_rep;
 #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp21_ = plugins_pluggable_rep_get_pluggable (_tmp20_);
+				_tmp18_ = plugins_pluggable_rep_get_pluggable (_tmp17_);
 #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp22_ = _tmp21_;
+				_tmp19_ = _tmp18_;
 #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				gee_collection_add (_tmp19_, _tmp22_);
-#line 2644 "Plugins.c"
+				gee_collection_add (_tmp16_, _tmp19_);
+#line 2878 "Plugins.c"
 			}
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 2648 "Plugins.c"
+#line 2882 "Plugins.c"
 		}
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_pluggable_rep_it);
-#line 2652 "Plugins.c"
+#line 2886 "Plugins.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = all;
 #line 193 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2658 "Plugins.c"
+#line 2892 "Plugins.c"
 }
 
 
-gboolean plugins_is_core_pluggable (SpitPluggable* pluggable) {
+gboolean
+plugins_is_core_pluggable (SpitPluggable* pluggable)
+{
 	gboolean result = FALSE;
 	GeeHashSet* _tmp0_;
-	SpitPluggable* _tmp1_;
-	const gchar* _tmp2_;
-	gboolean _tmp3_;
+	const gchar* _tmp1_;
 #line 196 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), FALSE);
 #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = plugins_core_ids;
 #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = pluggable;
-#line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = spit_pluggable_get_id (_tmp1_);
+	_tmp1_ = spit_pluggable_get_id (pluggable);
 #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
-#line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	result = _tmp3_;
+	result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
 #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2682 "Plugins.c"
+#line 2912 "Plugins.c"
 }
 
 
-static SpitPluggable** _vala_array_dup17 (SpitPluggable** self, int length) {
+static SpitPluggable**
+_vala_array_dup17 (SpitPluggable** self,
+                   int length)
+{
 	SpitPluggable** result;
 	int i;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = g_new0 (SpitPluggable*, length + 1);
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	for (i = 0; i < length; i++) {
-#line 2693 "Plugins.c"
+#line 2926 "Plugins.c"
 		SpitPluggable* _tmp0_;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		result[i] = _tmp0_;
-#line 2699 "Plugins.c"
+#line 2932 "Plugins.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2703 "Plugins.c"
+#line 2936 "Plugins.c"
 }
 
 
-PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
+PluginsModuleRep*
+plugins_get_module_for_pluggable (SpitPluggable* needle)
+{
 	PluginsModuleRep* result = NULL;
 #line 200 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (needle), NULL);
-#line 2711 "Plugins.c"
+#line 2946 "Plugins.c"
 	{
 		GeeIterator* _module_rep_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -2735,97 +2970,91 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 		_module_rep_it = _tmp5_;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 2738 "Plugins.c"
+#line 2973 "Plugins.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			PluginsModuleRep* module_rep = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
 			SpitPluggable** pluggables = NULL;
-			PluginsModuleRep* _tmp10_;
-			SpitModule* _tmp11_;
-			gint _tmp12_;
+			PluginsModuleRep* _tmp9_;
+			SpitModule* _tmp10_;
+			gint _tmp11_;
+			SpitPluggable** _tmp12_;
 			SpitPluggable** _tmp13_;
-			SpitPluggable** _tmp14_;
-			gint _tmp14__length1;
+			gint _tmp13__length1;
 			gint pluggables_length1;
 			gint _pluggables_size_;
-			SpitPluggable** _tmp15_;
-			gint _tmp15__length1;
+			SpitPluggable** _tmp14_;
+			gint _tmp14__length1;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp6_ = _module_rep_it;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 2763 "Plugins.c"
+#line 2995 "Plugins.c"
 			}
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp8_ = _module_rep_it;
+			_tmp7_ = _module_rep_it;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			module_rep = (PluginsModuleRep*) _tmp9_;
+			module_rep = (PluginsModuleRep*) _tmp8_;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp10_ = module_rep;
+			_tmp9_ = module_rep;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp11_ = _tmp10_->spit_module;
+			_tmp10_ = _tmp9_->spit_module;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp13_ = spit_module_get_pluggables (_tmp11_, &_tmp12_);
+			_tmp12_ = spit_module_get_pluggables (_tmp10_, &_tmp11_);
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp14_ = (_tmp13_ != NULL) ? _vala_array_dup17 (_tmp13_, _tmp12_) : ((gpointer) _tmp13_);
+			_tmp13_ = (_tmp12_ != NULL) ? _vala_array_dup17 (_tmp12_, _tmp11_) : ((gpointer) _tmp12_);
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp14__length1 = _tmp12_;
+			_tmp13__length1 = _tmp11_;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			pluggables = _tmp14_;
+			pluggables = _tmp13_;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			pluggables_length1 = _tmp14__length1;
+			pluggables_length1 = _tmp13__length1;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_pluggables_size_ = pluggables_length1;
 #line 203 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp15_ = pluggables;
+			_tmp14_ = pluggables;
 #line 203 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp15__length1 = pluggables_length1;
+			_tmp14__length1 = pluggables_length1;
 #line 203 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (_tmp15_ != NULL) {
-#line 2793 "Plugins.c"
-				SpitPluggable** _tmp16_;
-				gint _tmp16__length1;
+			if (_tmp14_ != NULL) {
+#line 3025 "Plugins.c"
+				SpitPluggable** _tmp15_;
+				gint _tmp15__length1;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp16_ = pluggables;
+				_tmp15_ = pluggables;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp16__length1 = pluggables_length1;
-#line 2800 "Plugins.c"
+				_tmp15__length1 = pluggables_length1;
+#line 3032 "Plugins.c"
 				{
 					SpitPluggable** pluggable_collection = NULL;
 					gint pluggable_collection_length1 = 0;
 					gint _pluggable_collection_size_ = 0;
 					gint pluggable_it = 0;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					pluggable_collection = _tmp16_;
+					pluggable_collection = _tmp15_;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					pluggable_collection_length1 = _tmp16__length1;
+					pluggable_collection_length1 = _tmp15__length1;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					for (pluggable_it = 0; pluggable_it < _tmp16__length1; pluggable_it = pluggable_it + 1) {
-#line 2812 "Plugins.c"
-						SpitPluggable* _tmp17_;
+					for (pluggable_it = 0; pluggable_it < _tmp15__length1; pluggable_it = pluggable_it + 1) {
+#line 3044 "Plugins.c"
+						SpitPluggable* _tmp16_;
 						SpitPluggable* pluggable = NULL;
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						_tmp17_ = _g_object_ref0 (pluggable_collection[pluggable_it]);
+						_tmp16_ = _g_object_ref0 (pluggable_collection[pluggable_it]);
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						pluggable = _tmp17_;
-#line 2819 "Plugins.c"
+						pluggable = _tmp16_;
+#line 3051 "Plugins.c"
 						{
-							SpitPluggable* _tmp18_;
-							SpitPluggable* _tmp19_;
-#line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-							_tmp18_ = pluggable;
+							SpitPluggable* _tmp17_;
 #line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-							_tmp19_ = needle;
+							_tmp17_ = pluggable;
 #line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-							if (_tmp18_ == _tmp19_) {
+							if (_tmp17_ == needle) {
 #line 206 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 								result = module_rep;
 #line 206 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2836,11 +3065,11 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 								_g_object_unref0 (_module_rep_it);
 #line 206 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 								return result;
-#line 2839 "Plugins.c"
+#line 3068 "Plugins.c"
 							}
 #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 							_g_object_unref0 (pluggable);
-#line 2843 "Plugins.c"
+#line 3072 "Plugins.c"
 						}
 					}
 				}
@@ -2849,71 +3078,74 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 			pluggables = (_vala_array_free (pluggables, pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_module_rep_unref0 (module_rep);
-#line 2852 "Plugins.c"
+#line 3081 "Plugins.c"
 		}
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_module_rep_it);
-#line 2856 "Plugins.c"
+#line 3085 "Plugins.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = NULL;
 #line 211 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2862 "Plugins.c"
+#line 3091 "Plugins.c"
 }
 
 
-gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) {
+gchar*
+plugins_get_pluggable_module_id (SpitPluggable* needle)
+{
 	gchar* result = NULL;
 	PluginsModuleRep* module_rep = NULL;
-	SpitPluggable* _tmp0_;
-	PluginsModuleRep* _tmp1_;
-	const gchar* _tmp2_ = NULL;
-	PluginsModuleRep* _tmp3_;
-	gchar* _tmp7_;
+	PluginsModuleRep* _tmp0_;
+	const gchar* _tmp1_ = NULL;
+	PluginsModuleRep* _tmp2_;
+	gchar* _tmp6_;
 #line 214 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (needle), NULL);
 #line 215 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = needle;
-#line 215 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = plugins_get_module_for_pluggable (_tmp0_);
+	_tmp0_ = plugins_get_module_for_pluggable (needle);
 #line 215 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	module_rep = _tmp1_;
+	module_rep = _tmp0_;
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = module_rep;
+	_tmp2_ = module_rep;
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp3_ != NULL) {
-#line 2886 "Plugins.c"
-		PluginsModuleRep* _tmp4_;
-		SpitModule* _tmp5_;
-		const gchar* _tmp6_;
+	if (_tmp2_ != NULL) {
+#line 3114 "Plugins.c"
+		PluginsModuleRep* _tmp3_;
+		SpitModule* _tmp4_;
+		const gchar* _tmp5_;
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp4_ = module_rep;
+		_tmp3_ = module_rep;
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp5_ = _tmp4_->spit_module;
+		_tmp4_ = _tmp3_->spit_module;
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp6_ = spit_module_get_id (_tmp5_);
+		_tmp5_ = spit_module_get_id (_tmp4_);
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp2_ = _tmp6_;
-#line 2898 "Plugins.c"
+		_tmp1_ = _tmp5_;
+#line 3126 "Plugins.c"
 	} else {
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp2_ = NULL;
-#line 2902 "Plugins.c"
+		_tmp1_ = NULL;
+#line 3130 "Plugins.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp7_ = g_strdup (_tmp2_);
+	_tmp6_ = g_strdup (_tmp1_);
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	result = _tmp7_;
+	result = _tmp6_;
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_module_rep_unref0 (module_rep);
 #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2912 "Plugins.c"
+#line 3140 "Plugins.c"
 }
 
 
-GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) {
+GeeCollection*
+plugins_get_extension_points (GCompareDataFunc compare_func,
+                              void* compare_func_target,
+                              GDestroyNotify compare_func_target_destroy_notify)
+{
 	GeeCollection* result = NULL;
 	GeeCollection* sorted = NULL;
 	GCompareDataFunc _tmp0_;
@@ -2964,34 +3196,34 @@ GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void
 	compare_func_target_destroy_notify = NULL;
 #line 224 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 2967 "Plugins.c"
+#line 3199 "Plugins.c"
 }
 
 
-GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled) {
+GeeCollection*
+plugins_get_pluggables_for_type (GType type,
+                                 GCompareDataFunc compare_func,
+                                 void* compare_func_target,
+                                 GDestroyNotify compare_func_target_destroy_notify,
+                                 gboolean include_disabled)
+{
 	GeeCollection* result = NULL;
 	GeeHashMap* _tmp0_;
-	GType _tmp1_;
-	gboolean _tmp2_;
 	GeeCollection* for_type = NULL;
-	GCompareDataFunc _tmp3_;
-	void* _tmp3__target;
-	GDestroyNotify _tmp3__target_destroy_notify;
-	GeeTreeSet* _tmp4_;
+	GCompareDataFunc _tmp1_;
+	void* _tmp1__target;
+	GDestroyNotify _tmp1__target_destroy_notify;
+	GeeTreeSet* _tmp2_;
 #line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = plugins_extension_points;
 #line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = type;
-#line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp1_));
-#line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_vala_assert (_tmp2_, "extension_points.has_key(type)");
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) type)), "extension_points.has_key(type)");
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = compare_func;
+	_tmp1_ = compare_func;
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3__target = compare_func_target;
+	_tmp1__target = compare_func_target;
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3__target_destroy_notify = compare_func_target_destroy_notify;
+	_tmp1__target_destroy_notify = compare_func_target_destroy_notify;
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	compare_func = NULL;
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2999,155 +3231,137 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	compare_func_target_destroy_notify = NULL;
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = gee_tree_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp3_, _tmp3__target, _tmp3__target_destroy_notify);
+	_tmp2_ = gee_tree_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp1_, _tmp1__target, _tmp1__target_destroy_notify);
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	for_type = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3005 "Plugins.c"
+	for_type = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
+#line 3237 "Plugins.c"
 	{
 		GeeIterator* _pluggable_rep_it = NULL;
-		GeeHashMap* _tmp5_;
+		GeeHashMap* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeCollection* _tmp5_;
 		GeeCollection* _tmp6_;
-		GeeCollection* _tmp7_;
-		GeeCollection* _tmp8_;
-		GeeIterator* _tmp9_;
-		GeeIterator* _tmp10_;
+		GeeIterator* _tmp7_;
+		GeeIterator* _tmp8_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp5_ = plugins_pluggable_table;
+		_tmp3_ = plugins_pluggable_table;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+		_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp7_ = _tmp6_;
+		_tmp5_ = _tmp4_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp8_ = _tmp7_;
+		_tmp6_ = _tmp5_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp10_ = _tmp9_;
+		_tmp8_ = _tmp7_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp6_);
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_pluggable_rep_it = _tmp10_;
+		_pluggable_rep_it = _tmp8_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 3032 "Plugins.c"
-			GeeIterator* _tmp11_;
-			gboolean _tmp12_;
+#line 3264 "Plugins.c"
+			GeeIterator* _tmp9_;
 			PluginsPluggableRep* pluggable_rep = NULL;
-			GeeIterator* _tmp13_;
-			gpointer _tmp14_;
-			gboolean _tmp15_ = FALSE;
-			gboolean _tmp16_ = FALSE;
-			PluginsPluggableRep* _tmp17_;
-			gboolean _tmp18_;
-			gboolean _tmp19_;
-#line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp11_ = _pluggable_rep_it;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			gboolean _tmp12_ = FALSE;
+			gboolean _tmp13_ = FALSE;
+			PluginsPluggableRep* _tmp14_;
+			gboolean _tmp15_;
+			gboolean _tmp16_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp12_ = gee_iterator_next (_tmp11_);
+			_tmp9_ = _pluggable_rep_it;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (!_tmp12_) {
+			if (!gee_iterator_next (_tmp9_)) {
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 3051 "Plugins.c"
+#line 3280 "Plugins.c"
 			}
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp13_ = _pluggable_rep_it;
+			_tmp10_ = _pluggable_rep_it;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp14_ = gee_iterator_get (_tmp13_);
+			_tmp11_ = gee_iterator_get (_tmp10_);
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			pluggable_rep = (PluginsPluggableRep*) _tmp14_;
+			pluggable_rep = (PluginsPluggableRep*) _tmp11_;
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp17_ = pluggable_rep;
+			_tmp14_ = pluggable_rep;
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp18_ = plugins_pluggable_rep_get_activated (_tmp17_);
+			_tmp15_ = plugins_pluggable_rep_get_activated (_tmp14_);
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp19_ = _tmp18_;
+			_tmp16_ = _tmp15_;
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (_tmp19_) {
-#line 3067 "Plugins.c"
-				PluginsPluggableRep* _tmp20_;
-				SpitPluggable* _tmp21_;
-				SpitPluggable* _tmp22_;
-				GType _tmp23_;
-				GType _tmp24_;
-				gboolean _tmp25_;
-#line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp20_ = pluggable_rep;
-#line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp21_ = plugins_pluggable_rep_get_pluggable (_tmp20_);
-#line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp22_ = _tmp21_;
+			if (_tmp16_) {
+#line 3296 "Plugins.c"
+				PluginsPluggableRep* _tmp17_;
+				SpitPluggable* _tmp18_;
+				SpitPluggable* _tmp19_;
 #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp23_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_OBJECT, GObject));
+				_tmp17_ = pluggable_rep;
 #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp24_ = type;
+				_tmp18_ = plugins_pluggable_rep_get_pluggable (_tmp17_);
 #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp25_ = g_type_is_a (_tmp23_, _tmp24_);
+				_tmp19_ = _tmp18_;
 #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp16_ = _tmp25_;
-#line 3088 "Plugins.c"
+				_tmp13_ = g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, G_TYPE_OBJECT, GObject)), type);
+#line 3308 "Plugins.c"
 			} else {
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp16_ = FALSE;
-#line 3092 "Plugins.c"
+				_tmp13_ = FALSE;
+#line 3312 "Plugins.c"
 			}
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (_tmp16_) {
-#line 3096 "Plugins.c"
-				gboolean _tmp26_ = FALSE;
-				gboolean _tmp27_;
+			if (_tmp13_) {
+#line 3316 "Plugins.c"
+				gboolean _tmp20_ = FALSE;
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp27_ = include_disabled;
+				if (include_disabled) {
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				if (_tmp27_) {
-#line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp26_ = TRUE;
-#line 3105 "Plugins.c"
+					_tmp20_ = TRUE;
+#line 3322 "Plugins.c"
 				} else {
-					PluginsPluggableRep* _tmp28_;
-					gboolean _tmp29_;
-#line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp28_ = pluggable_rep;
+					PluginsPluggableRep* _tmp21_;
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp29_ = plugins_pluggable_rep_is_enabled (_tmp28_);
+					_tmp21_ = pluggable_rep;
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp26_ = _tmp29_;
-#line 3115 "Plugins.c"
+					_tmp20_ = plugins_pluggable_rep_is_enabled (_tmp21_);
+#line 3329 "Plugins.c"
 				}
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp15_ = _tmp26_;
-#line 3119 "Plugins.c"
+				_tmp12_ = _tmp20_;
+#line 3333 "Plugins.c"
 			} else {
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp15_ = FALSE;
-#line 3123 "Plugins.c"
+				_tmp12_ = FALSE;
+#line 3337 "Plugins.c"
 			}
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (_tmp15_) {
-#line 3127 "Plugins.c"
-				GeeCollection* _tmp30_;
-				PluginsPluggableRep* _tmp31_;
-				SpitPluggable* _tmp32_;
-				SpitPluggable* _tmp33_;
+			if (_tmp12_) {
+#line 3341 "Plugins.c"
+				GeeCollection* _tmp22_;
+				PluginsPluggableRep* _tmp23_;
+				SpitPluggable* _tmp24_;
+				SpitPluggable* _tmp25_;
 #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp30_ = for_type;
+				_tmp22_ = for_type;
 #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp31_ = pluggable_rep;
+				_tmp23_ = pluggable_rep;
 #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp32_ = plugins_pluggable_rep_get_pluggable (_tmp31_);
+				_tmp24_ = plugins_pluggable_rep_get_pluggable (_tmp23_);
 #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp33_ = _tmp32_;
+				_tmp25_ = _tmp24_;
 #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				gee_collection_add (_tmp30_, _tmp33_);
-#line 3142 "Plugins.c"
+				gee_collection_add (_tmp22_, _tmp25_);
+#line 3356 "Plugins.c"
 			}
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 3146 "Plugins.c"
+#line 3360 "Plugins.c"
 		}
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_pluggable_rep_it);
-#line 3150 "Plugins.c"
+#line 3364 "Plugins.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = for_type;
@@ -3161,98 +3375,99 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 	compare_func_target_destroy_notify = NULL;
 #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3164 "Plugins.c"
+#line 3378 "Plugins.c"
 }
 
 
-gchar* plugins_get_pluggable_name (const gchar* id) {
+gchar*
+plugins_get_pluggable_name (const gchar* id)
+{
 	gchar* result = NULL;
 	PluginsPluggableRep* pluggable_rep = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	PluginsPluggableRep* _tmp5_;
-	gchar* _tmp13_;
+	gpointer _tmp1_;
+	const gchar* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	PluginsPluggableRep* _tmp4_;
+	gchar* _tmp12_;
 #line 244 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (id != NULL, NULL);
 #line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = plugins_pluggable_table;
 #line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = id;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), id);
 #line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	pluggable_rep = (PluginsPluggableRep*) _tmp2_;
+	pluggable_rep = (PluginsPluggableRep*) _tmp1_;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp5_ = pluggable_rep;
+	_tmp4_ = pluggable_rep;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp5_ != NULL) {
-#line 3192 "Plugins.c"
-		PluginsPluggableRep* _tmp6_;
+	if (_tmp4_ != NULL) {
+#line 3405 "Plugins.c"
+		PluginsPluggableRep* _tmp5_;
+		gboolean _tmp6_;
 		gboolean _tmp7_;
-		gboolean _tmp8_;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp6_ = pluggable_rep;
+		_tmp5_ = pluggable_rep;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp7_ = plugins_pluggable_rep_get_activated (_tmp6_);
+		_tmp6_ = plugins_pluggable_rep_get_activated (_tmp5_);
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp4_ = _tmp8_;
-#line 3204 "Plugins.c"
+		_tmp3_ = _tmp7_;
+#line 3417 "Plugins.c"
 	} else {
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp4_ = FALSE;
-#line 3208 "Plugins.c"
+		_tmp3_ = FALSE;
+#line 3421 "Plugins.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp4_) {
-#line 3212 "Plugins.c"
-		PluginsPluggableRep* _tmp9_;
+	if (_tmp3_) {
+#line 3425 "Plugins.c"
+		PluginsPluggableRep* _tmp8_;
+		SpitPluggable* _tmp9_;
 		SpitPluggable* _tmp10_;
-		SpitPluggable* _tmp11_;
-		const gchar* _tmp12_;
+		const gchar* _tmp11_;
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp9_ = pluggable_rep;
+		_tmp8_ = pluggable_rep;
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp10_ = plugins_pluggable_rep_get_pluggable (_tmp9_);
+		_tmp9_ = plugins_pluggable_rep_get_pluggable (_tmp8_);
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp12_ = spit_pluggable_get_pluggable_name (_tmp11_);
+		_tmp11_ = spit_pluggable_get_pluggable_name (_tmp10_);
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp3_ = _tmp12_;
-#line 3227 "Plugins.c"
+		_tmp2_ = _tmp11_;
+#line 3440 "Plugins.c"
 	} else {
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp3_ = NULL;
-#line 3231 "Plugins.c"
+		_tmp2_ = NULL;
+#line 3444 "Plugins.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp13_ = g_strdup (_tmp3_);
+	_tmp12_ = g_strdup (_tmp2_);
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	result = _tmp13_;
+	result = _tmp12_;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3241 "Plugins.c"
+#line 3454 "Plugins.c"
 }
 
 
-gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) {
+gboolean
+plugins_get_pluggable_info (const gchar* id,
+                            SpitPluggableInfo* info)
+{
 	gboolean result = FALSE;
 	PluginsPluggableRep* pluggable_rep = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	gboolean _tmp3_ = FALSE;
-	PluginsPluggableRep* _tmp4_;
-	PluginsPluggableRep* _tmp8_;
+	gpointer _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	PluginsPluggableRep* _tmp3_;
+	PluginsPluggableRep* _tmp7_;
+	SpitPluggable* _tmp8_;
 	SpitPluggable* _tmp9_;
-	SpitPluggable* _tmp10_;
 #line 251 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
 #line 251 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3260,104 +3475,101 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) {
 #line 252 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = plugins_pluggable_table;
 #line 252 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = id;
-#line 252 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), id);
 #line 252 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	pluggable_rep = (PluginsPluggableRep*) _tmp2_;
+	pluggable_rep = (PluginsPluggableRep*) _tmp1_;
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = pluggable_rep;
+	_tmp3_ = pluggable_rep;
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp4_ == NULL) {
+	if (_tmp3_ == NULL) {
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp3_ = TRUE;
-#line 3274 "Plugins.c"
+		_tmp2_ = TRUE;
+#line 3487 "Plugins.c"
 	} else {
-		PluginsPluggableRep* _tmp5_;
+		PluginsPluggableRep* _tmp4_;
+		gboolean _tmp5_;
 		gboolean _tmp6_;
-		gboolean _tmp7_;
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp5_ = pluggable_rep;
+		_tmp4_ = pluggable_rep;
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp6_ = plugins_pluggable_rep_get_activated (_tmp5_);
+		_tmp5_ = plugins_pluggable_rep_get_activated (_tmp4_);
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp3_ = !_tmp7_;
-#line 3287 "Plugins.c"
+		_tmp2_ = !_tmp6_;
+#line 3500 "Plugins.c"
 	}
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 254 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		result = FALSE;
 #line 254 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 254 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return result;
-#line 3297 "Plugins.c"
+#line 3510 "Plugins.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp8_ = pluggable_rep;
+	_tmp7_ = pluggable_rep;
 #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp9_ = plugins_pluggable_rep_get_pluggable (_tmp8_);
+	_tmp8_ = plugins_pluggable_rep_get_pluggable (_tmp7_);
 #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	spit_pluggable_get_info (_tmp10_, info);
+	spit_pluggable_get_info (_tmp9_, info);
 #line 258 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = TRUE;
 #line 258 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 258 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3313 "Plugins.c"
+#line 3526 "Plugins.c"
 }
 
 
-gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) {
+gboolean
+plugins_get_pluggable_enabled (const gchar* id,
+                               gboolean* enabled)
+{
 	gboolean _vala_enabled = FALSE;
 	gboolean result = FALSE;
 	PluginsPluggableRep* pluggable_rep = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	gboolean _tmp3_ = FALSE;
-	PluginsPluggableRep* _tmp4_;
-	PluginsPluggableRep* _tmp8_;
-	gboolean _tmp9_;
+	gpointer _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	PluginsPluggableRep* _tmp3_;
+	PluginsPluggableRep* _tmp7_;
 #line 261 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
 #line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = plugins_pluggable_table;
 #line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = id;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), id);
 #line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	pluggable_rep = (PluginsPluggableRep*) _tmp2_;
+	pluggable_rep = (PluginsPluggableRep*) _tmp1_;
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = pluggable_rep;
+	_tmp3_ = pluggable_rep;
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp4_ == NULL) {
+	if (_tmp3_ == NULL) {
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp3_ = TRUE;
-#line 3344 "Plugins.c"
+		_tmp2_ = TRUE;
+#line 3556 "Plugins.c"
 	} else {
-		PluginsPluggableRep* _tmp5_;
+		PluginsPluggableRep* _tmp4_;
+		gboolean _tmp5_;
 		gboolean _tmp6_;
-		gboolean _tmp7_;
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp5_ = pluggable_rep;
+		_tmp4_ = pluggable_rep;
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp6_ = plugins_pluggable_rep_get_activated (_tmp5_);
+		_tmp5_ = plugins_pluggable_rep_get_activated (_tmp4_);
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp3_ = !_tmp7_;
-#line 3357 "Plugins.c"
+		_tmp2_ = !_tmp6_;
+#line 3569 "Plugins.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 264 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_vala_enabled = FALSE;
 #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3368,18 +3580,16 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) {
 		if (enabled) {
 #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			*enabled = _vala_enabled;
-#line 3371 "Plugins.c"
+#line 3583 "Plugins.c"
 		}
 #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return result;
-#line 3375 "Plugins.c"
+#line 3587 "Plugins.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp8_ = pluggable_rep;
-#line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp9_ = plugins_pluggable_rep_is_enabled (_tmp8_);
+	_tmp7_ = pluggable_rep;
 #line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_vala_enabled = _tmp9_;
+	_vala_enabled = plugins_pluggable_rep_is_enabled (_tmp7_);
 #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = TRUE;
 #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3388,247 +3598,224 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) {
 	if (enabled) {
 #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		*enabled = _vala_enabled;
-#line 3391 "Plugins.c"
+#line 3601 "Plugins.c"
 	}
 #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3395 "Plugins.c"
+#line 3605 "Plugins.c"
 }
 
 
-void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) {
+void
+plugins_set_pluggable_enabled (const gchar* id,
+                               gboolean enabled)
+{
 	PluginsPluggableRep* pluggable_rep = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	gboolean _tmp3_ = FALSE;
-	PluginsPluggableRep* _tmp4_;
-	PluginsPluggableRep* _tmp8_;
-	gboolean _tmp9_;
-	gboolean _tmp10_;
+	gpointer _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	PluginsPluggableRep* _tmp3_;
+	PluginsPluggableRep* _tmp7_;
 #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (id != NULL);
 #line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0_ = plugins_pluggable_table;
 #line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = id;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), id);
 #line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	pluggable_rep = (PluginsPluggableRep*) _tmp2_;
+	pluggable_rep = (PluginsPluggableRep*) _tmp1_;
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = pluggable_rep;
+	_tmp3_ = pluggable_rep;
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp4_ == NULL) {
+	if (_tmp3_ == NULL) {
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp3_ = TRUE;
-#line 3425 "Plugins.c"
+		_tmp2_ = TRUE;
+#line 3633 "Plugins.c"
 	} else {
-		PluginsPluggableRep* _tmp5_;
+		PluginsPluggableRep* _tmp4_;
+		gboolean _tmp5_;
 		gboolean _tmp6_;
-		gboolean _tmp7_;
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp5_ = pluggable_rep;
+		_tmp4_ = pluggable_rep;
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp6_ = plugins_pluggable_rep_get_activated (_tmp5_);
+		_tmp5_ = plugins_pluggable_rep_get_activated (_tmp4_);
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp3_ = !_tmp7_;
-#line 3438 "Plugins.c"
+		_tmp2_ = !_tmp6_;
+#line 3646 "Plugins.c"
 	}
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 277 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_pluggable_rep_unref0 (pluggable_rep);
 #line 277 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 3446 "Plugins.c"
+#line 3654 "Plugins.c"
 	}
 #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp8_ = pluggable_rep;
+	_tmp7_ = pluggable_rep;
 #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp9_ = enabled;
-#line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp10_ = plugins_pluggable_rep_set_enabled (_tmp8_, _tmp9_);
-#line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp10_) {
-#line 3456 "Plugins.c"
-		PluginsNotifier* _tmp11_;
-		PluginsNotifier* _tmp12_;
-		PluginsPluggableRep* _tmp13_;
-		SpitPluggable* _tmp14_;
-		SpitPluggable* _tmp15_;
-		gboolean _tmp16_;
-#line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp11_ = plugins_notifier_get_instance ();
+	if (plugins_pluggable_rep_set_enabled (_tmp7_, enabled)) {
+#line 3660 "Plugins.c"
+		PluginsNotifier* _tmp8_;
+		PluginsNotifier* _tmp9_;
+		PluginsPluggableRep* _tmp10_;
+		SpitPluggable* _tmp11_;
+		SpitPluggable* _tmp12_;
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp12_ = _tmp11_;
+		_tmp8_ = plugins_notifier_get_instance ();
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp13_ = pluggable_rep;
+		_tmp9_ = _tmp8_;
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp14_ = plugins_pluggable_rep_get_pluggable (_tmp13_);
+		_tmp10_ = pluggable_rep;
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp15_ = _tmp14_;
+		_tmp11_ = plugins_pluggable_rep_get_pluggable (_tmp10_);
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp16_ = enabled;
+		_tmp12_ = _tmp11_;
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		g_signal_emit (_tmp12_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp15_, _tmp16_);
+		g_signal_emit (_tmp9_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp12_, enabled);
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_plugins_notifier_unref0 (_tmp12_);
-#line 3479 "Plugins.c"
+		_plugins_notifier_unref0 (_tmp9_);
+#line 3680 "Plugins.c"
 	}
 #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 3483 "Plugins.c"
+#line 3684 "Plugins.c"
 }
 
 
-GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) {
+GFile*
+plugins_get_pluggable_module_file (SpitPluggable* pluggable)
+{
 	GFile* result = NULL;
 	PluginsModuleRep* module_rep = NULL;
-	SpitPluggable* _tmp0_;
-	PluginsModuleRep* _tmp1_;
-	GFile* _tmp2_ = NULL;
-	PluginsModuleRep* _tmp3_;
-	GFile* _tmp6_;
+	PluginsModuleRep* _tmp0_;
+	GFile* _tmp1_ = NULL;
+	PluginsModuleRep* _tmp2_;
+	GFile* _tmp5_;
 #line 283 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL);
 #line 284 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = pluggable;
-#line 284 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = plugins_get_module_for_pluggable (_tmp0_);
+	_tmp0_ = plugins_get_module_for_pluggable (pluggable);
 #line 284 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	module_rep = _tmp1_;
+	module_rep = _tmp0_;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = module_rep;
+	_tmp2_ = module_rep;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp3_ != NULL) {
-#line 3507 "Plugins.c"
-		PluginsModuleRep* _tmp4_;
-		GFile* _tmp5_;
+	if (_tmp2_ != NULL) {
+#line 3707 "Plugins.c"
+		PluginsModuleRep* _tmp3_;
+		GFile* _tmp4_;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp4_ = module_rep;
+		_tmp3_ = module_rep;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp5_ = _tmp4_->file;
+		_tmp4_ = _tmp3_->file;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp2_ = _tmp5_;
-#line 3516 "Plugins.c"
+		_tmp1_ = _tmp4_;
+#line 3716 "Plugins.c"
 	} else {
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp2_ = NULL;
-#line 3520 "Plugins.c"
+		_tmp1_ = NULL;
+#line 3720 "Plugins.c"
 	}
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp6_ = _g_object_ref0 (_tmp2_);
+	_tmp5_ = _g_object_ref0 (_tmp1_);
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	result = _tmp6_;
+	result = _tmp5_;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_module_rep_unref0 (module_rep);
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3530 "Plugins.c"
+#line 3730 "Plugins.c"
 }
 
 
-gint plugins_compare_pluggable_names (void* a, void* b) {
+gint
+plugins_compare_pluggable_names (void* a,
+                                 void* b)
+{
 	gint result = 0;
 	SpitPluggable* apluggable = NULL;
-	void* _tmp0_;
 	SpitPluggable* bpluggable = NULL;
-	void* _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gint _tmp4_;
-#line 290 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = a;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 290 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	apluggable = (SpitPluggable*) _tmp0_;
+	apluggable = (SpitPluggable*) a;
 #line 291 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = b;
-#line 291 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	bpluggable = (SpitPluggable*) _tmp1_;
-#line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (apluggable, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	bpluggable = (SpitPluggable*) b;
 #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (bpluggable, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_tmp0_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (apluggable, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = g_utf8_collate (_tmp2_, _tmp3_);
+	_tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (bpluggable, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	result = _tmp4_;
+	result = g_utf8_collate (_tmp0_, _tmp1_);
 #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3561 "Plugins.c"
+#line 3755 "Plugins.c"
 }
 
 
-gint plugins_compare_extension_point_names (void* a, void* b) {
+gint
+plugins_compare_extension_point_names (void* a,
+                                       void* b)
+{
 	gint result = 0;
 	PluginsExtensionPoint* apoint = NULL;
-	void* _tmp0_;
 	PluginsExtensionPoint* bpoint = NULL;
-	void* _tmp1_;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp5_;
-	gint _tmp6_;
-#line 297 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = a;
 #line 297 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	apoint = (PluginsExtensionPoint*) _tmp0_;
+	apoint = (PluginsExtensionPoint*) a;
 #line 298 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = b;
-#line 298 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	bpoint = (PluginsExtensionPoint*) _tmp1_;
+	bpoint = (PluginsExtensionPoint*) b;
 #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = plugins_extension_point_get_name (G_TYPE_CHECK_INSTANCE_CAST (apoint, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint));
+	_tmp0_ = plugins_extension_point_get_name (G_TYPE_CHECK_INSTANCE_CAST (apoint, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint));
 #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = plugins_extension_point_get_name (G_TYPE_CHECK_INSTANCE_CAST (bpoint, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint));
+	_tmp2_ = plugins_extension_point_get_name (G_TYPE_CHECK_INSTANCE_CAST (bpoint, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint));
 #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = _tmp2_;
 #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp6_ = g_utf8_collate (_tmp3_, _tmp5_);
-#line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	result = _tmp6_;
+	result = g_utf8_collate (_tmp1_, _tmp3_);
 #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3598 "Plugins.c"
+#line 3786 "Plugins.c"
 }
 
 
-gboolean plugins_is_shared_library (GFile* file) {
+gboolean
+plugins_is_shared_library (GFile* file)
+{
 	gboolean result = FALSE;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	GFile* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
+	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
 #line 303 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = file;
-#line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = g_file_get_basename (_tmp0_);
+	_tmp0_ = g_file_get_basename (file);
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	disassemble_filename (_tmp2_, &_tmp3_, &_tmp4_);
+	disassemble_filename (_tmp1_, &_tmp2_, &_tmp3_);
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (name);
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	name = _tmp3_;
+	name = _tmp2_;
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (ext);
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	ext = _tmp4_;
+	ext = _tmp3_;
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_g_free0 (_tmp2_);
-#line 3631 "Plugins.c"
+	_g_free0 (_tmp1_);
+#line 3818 "Plugins.c"
 	{
 		const gchar** shared_ext_collection = NULL;
 		gint shared_ext_collection_length1 = 0;
@@ -3640,23 +3827,23 @@ gboolean plugins_is_shared_library (GFile* file) {
 		shared_ext_collection_length1 = G_N_ELEMENTS (PLUGINS_SHARED_LIB_EXTS);
 #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		for (shared_ext_it = 0; shared_ext_it < G_N_ELEMENTS (PLUGINS_SHARED_LIB_EXTS); shared_ext_it = shared_ext_it + 1) {
-#line 3643 "Plugins.c"
-			gchar* _tmp5_;
+#line 3830 "Plugins.c"
+			gchar* _tmp4_;
 			gchar* shared_ext = NULL;
 #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp5_ = g_strdup (shared_ext_collection[shared_ext_it]);
+			_tmp4_ = g_strdup (shared_ext_collection[shared_ext_it]);
 #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			shared_ext = _tmp5_;
-#line 3650 "Plugins.c"
+			shared_ext = _tmp4_;
+#line 3837 "Plugins.c"
 			{
+				const gchar* _tmp5_;
 				const gchar* _tmp6_;
-				const gchar* _tmp7_;
 #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp6_ = ext;
+				_tmp5_ = ext;
 #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp7_ = shared_ext;
+				_tmp6_ = shared_ext;
 #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				if (g_strcmp0 (_tmp6_, _tmp7_) == 0) {
+				if (g_strcmp0 (_tmp5_, _tmp6_) == 0) {
 #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					result = TRUE;
 #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3667,11 +3854,11 @@ gboolean plugins_is_shared_library (GFile* file) {
 					_g_free0 (name);
 #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					return result;
-#line 3670 "Plugins.c"
+#line 3857 "Plugins.c"
 				}
 #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_g_free0 (shared_ext);
-#line 3674 "Plugins.c"
+#line 3861 "Plugins.c"
 			}
 		}
 	}
@@ -3683,76 +3870,70 @@ gboolean plugins_is_shared_library (GFile* file) {
 	_g_free0 (name);
 #line 312 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3686 "Plugins.c"
+#line 3873 "Plugins.c"
 }
 
 
-void plugins_search_for_plugins (GFile* dir, GError** error) {
-	GFile* _tmp0_;
+void
+plugins_search_for_plugins (GFile* dir,
+                            GError** error)
+{
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp3_;
-	GFileEnumerator* _tmp4_;
+	GFileEnumerator* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_IS_FILE (dir));
 #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = dir;
-#line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = g_file_get_path (_tmp0_);
+	_tmp0_ = g_file_get_path (dir);
 #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	g_debug ("Plugins.vala:316: Searching %s for plugins…", _tmp2_);
+	g_debug ("Plugins.vala:316: Searching %s for plugins…", _tmp1_);
 #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = dir;
+	_tmp2_ = g_file_enumerate_children (dir, UTIL_FILE_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
 #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = g_file_enumerate_children (_tmp3_, UTIL_FILE_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	enumerator = _tmp4_;
+	enumerator = _tmp2_;
 #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_propagate_error (error, _inner_error_);
 #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 3722 "Plugins.c"
+#line 3906 "Plugins.c"
 	}
 	{
-		gboolean _tmp5_ = FALSE;
+		gboolean _tmp3_ = FALSE;
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp5_ = TRUE;
+		_tmp3_ = TRUE;
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 3730 "Plugins.c"
+#line 3914 "Plugins.c"
 			GFileInfo* info = NULL;
-			GFileEnumerator* _tmp6_;
+			GFileEnumerator* _tmp4_;
+			GFileInfo* _tmp5_;
+			GFileInfo* _tmp6_;
 			GFileInfo* _tmp7_;
-			GFileInfo* _tmp8_;
-			GFileInfo* _tmp9_;
-			gboolean _tmp10_;
 			GFile* file = NULL;
-			GFile* _tmp11_;
-			GFileInfo* _tmp12_;
-			const gchar* _tmp13_;
-			GFile* _tmp14_;
-			GFileInfo* _tmp15_;
-			GFileType _tmp16_;
+			GFileInfo* _tmp8_;
+			const gchar* _tmp9_;
+			GFile* _tmp10_;
+			GFileInfo* _tmp11_;
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (!_tmp5_) {
-#line 3746 "Plugins.c"
+			if (!_tmp3_) {
+#line 3927 "Plugins.c"
 			}
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp5_ = FALSE;
+			_tmp3_ = FALSE;
 #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp6_ = enumerator;
+			_tmp4_ = enumerator;
 #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp7_ = g_file_enumerator_next_file (_tmp6_, NULL, &_inner_error_);
+			_tmp5_ = g_file_enumerator_next_file (_tmp4_, NULL, &_inner_error_);
 #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			info = _tmp7_;
+			info = _tmp5_;
 #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3761,59 +3942,53 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 				_g_object_unref0 (enumerator);
 #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				return;
-#line 3764 "Plugins.c"
+#line 3945 "Plugins.c"
 			}
 #line 324 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp8_ = info;
+			_tmp6_ = info;
 #line 324 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (_tmp8_ == NULL) {
+			if (_tmp6_ == NULL) {
 #line 325 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_g_object_unref0 (info);
 #line 325 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				break;
-#line 3774 "Plugins.c"
+#line 3955 "Plugins.c"
 			}
 #line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp9_ = info;
-#line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp10_ = g_file_info_get_is_hidden (_tmp9_);
+			_tmp7_ = info;
 #line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			if (_tmp10_) {
+			if (g_file_info_get_is_hidden (_tmp7_)) {
 #line 328 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_g_object_unref0 (info);
 #line 328 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				continue;
-#line 3786 "Plugins.c"
+#line 3965 "Plugins.c"
 			}
 #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp11_ = dir;
-#line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp12_ = info;
+			_tmp8_ = info;
 #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp13_ = g_file_info_get_name (_tmp12_);
+			_tmp9_ = g_file_info_get_name (_tmp8_);
 #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp14_ = g_file_get_child (_tmp11_, _tmp13_);
+			_tmp10_ = g_file_get_child (dir, _tmp9_);
 #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			file = _tmp14_;
-#line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp15_ = info;
+			file = _tmp10_;
 #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp16_ = g_file_info_get_file_type (_tmp15_);
+			_tmp11_ = info;
 #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			switch (_tmp16_) {
+			switch (g_file_info_get_file_type (_tmp11_)) {
 #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				case G_FILE_TYPE_DIRECTORY:
-#line 3806 "Plugins.c"
+#line 3981 "Plugins.c"
 				{
 					{
-						GFile* _tmp17_;
+						GFile* _tmp12_;
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						_tmp17_ = file;
+						_tmp12_ = file;
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						plugins_search_for_plugins (_tmp17_, &_inner_error_);
+						plugins_search_for_plugins (_tmp12_, &_inner_error_);
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3816 "Plugins.c"
+#line 3991 "Plugins.c"
 							goto __catch40_g_error;
 						}
 					}
@@ -3821,32 +3996,32 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 					__catch40_g_error:
 					{
 						GError* err = NULL;
-						GFile* _tmp18_;
-						gchar* _tmp19_;
-						gchar* _tmp20_;
-						GError* _tmp21_;
-						const gchar* _tmp22_;
+						GFile* _tmp13_;
+						gchar* _tmp14_;
+						gchar* _tmp15_;
+						GError* _tmp16_;
+						const gchar* _tmp17_;
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						err = _inner_error_;
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						_inner_error_ = NULL;
 #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						_tmp18_ = file;
+						_tmp13_ = file;
 #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						_tmp19_ = g_file_get_path (_tmp18_);
+						_tmp14_ = g_file_get_path (_tmp13_);
 #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						_tmp20_ = _tmp19_;
+						_tmp15_ = _tmp14_;
 #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						_tmp21_ = err;
+						_tmp16_ = err;
 #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						_tmp22_ = _tmp21_->message;
+						_tmp17_ = _tmp16_->message;
 #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						g_warning ("Plugins.vala:337: Unable to search directory %s for plugins: %s", _tmp20_, _tmp22_);
+						g_warning ("Plugins.vala:337: Unable to search directory %s for plugins: %s", _tmp15_, _tmp17_);
 #line 337 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						_g_free0 (_tmp20_);
+						_g_free0 (_tmp15_);
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						_g_error_free0 (err);
-#line 3849 "Plugins.c"
+#line 4024 "Plugins.c"
 					}
 					__finally40:
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3861,199 +4036,186 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 						_g_object_unref0 (enumerator);
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						return;
-#line 3864 "Plugins.c"
+#line 4039 "Plugins.c"
 					}
 #line 339 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					break;
-#line 3868 "Plugins.c"
+#line 4043 "Plugins.c"
 				}
 #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				case G_FILE_TYPE_REGULAR:
-#line 3872 "Plugins.c"
+#line 4047 "Plugins.c"
 				{
-					GFile* _tmp23_;
-					gboolean _tmp24_;
+					GFile* _tmp18_;
 #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp23_ = file;
+					_tmp18_ = file;
 #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					_tmp24_ = plugins_is_shared_library (_tmp23_);
-#line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-					if (_tmp24_) {
-#line 3882 "Plugins.c"
-						GFile* _tmp25_;
+					if (plugins_is_shared_library (_tmp18_)) {
+#line 4054 "Plugins.c"
+						GFile* _tmp19_;
 #line 343 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						_tmp25_ = file;
+						_tmp19_ = file;
 #line 343 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-						plugins_load_module (_tmp25_);
-#line 3888 "Plugins.c"
+						plugins_load_module (_tmp19_);
+#line 4060 "Plugins.c"
 					}
 #line 344 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					break;
-#line 3892 "Plugins.c"
+#line 4064 "Plugins.c"
 				}
 				default:
 				{
 #line 348 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					break;
-#line 3898 "Plugins.c"
+#line 4070 "Plugins.c"
 				}
 			}
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_g_object_unref0 (file);
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_g_object_unref0 (info);
-#line 3905 "Plugins.c"
+#line 4077 "Plugins.c"
 		}
 	}
 #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_object_unref0 (enumerator);
-#line 3910 "Plugins.c"
+#line 4082 "Plugins.c"
 }
 
 
-void plugins_load_module (GFile* file) {
+void
+plugins_load_module (GFile* file)
+{
 	PluginsModuleRep* module_rep = NULL;
-	GFile* _tmp0_;
+	PluginsModuleRep* _tmp0_;
 	PluginsModuleRep* _tmp1_;
-	PluginsModuleRep* _tmp2_;
 	void* entry = NULL;
-	PluginsModuleRep* _tmp7_;
-	GModule* _tmp8_;
-	void* _tmp9_ = NULL;
-	gboolean _tmp10_;
+	PluginsModuleRep* _tmp5_;
+	GModule* _tmp6_;
+	void* _tmp7_ = NULL;
+	gboolean _tmp8_;
 	SpitEntryPoint spit_entry_point = NULL;
-	void* _tmp14_;
-	gboolean _tmp15_ = FALSE;
+	void* _tmp11_;
+	gboolean _tmp12_ = FALSE;
 	SpitEntryPointParams params = {0};
-	GFile* _tmp16_;
-	GFile* _tmp17_;
-	PluginsModuleRep* _tmp18_;
-	SpitEntryPoint _tmp19_;
-	SpitModule* _tmp20_;
-	SpitEntryPointParams _tmp21_;
-	gint _tmp22_;
-	gboolean _tmp26_ = FALSE;
-	SpitEntryPointParams _tmp27_;
-	gint _tmp28_;
+	GFile* _tmp13_;
+	PluginsModuleRep* _tmp14_;
+	SpitEntryPoint _tmp15_;
+	SpitModule* _tmp16_;
+	SpitEntryPointParams _tmp17_;
+	gint _tmp18_;
+	gboolean _tmp21_ = FALSE;
+	SpitEntryPointParams _tmp22_;
+	gint _tmp23_;
+	PluginsModuleRep* _tmp30_;
+	SpitEntryPointParams _tmp31_;
+	gint _tmp32_;
+	PluginsModuleRep* _tmp33_;
+	SpitModule* _tmp34_;
 	PluginsModuleRep* _tmp36_;
-	SpitEntryPointParams _tmp37_;
-	gint _tmp38_;
-	PluginsModuleRep* _tmp39_;
-	SpitModule* _tmp40_;
+	SpitModule* _tmp37_;
 	PluginsModuleRep* _tmp42_;
-	SpitModule* _tmp43_;
-	PluginsModuleRep* _tmp49_;
-	PluginsModuleRep* _tmp50_;
-	SpitModule* _tmp51_;
-	const gchar* _tmp52_;
-	gchar* _tmp53_;
+	PluginsModuleRep* _tmp43_;
+	SpitModule* _tmp44_;
+	const gchar* _tmp45_;
+	gchar* _tmp46_;
+	PluginsModuleRep* _tmp47_;
+	const gchar* _tmp48_;
+	GeeHashMap* _tmp53_;
 	PluginsModuleRep* _tmp54_;
 	const gchar* _tmp55_;
-	GeeHashMap* _tmp61_;
 	PluginsModuleRep* _tmp62_;
-	const gchar* _tmp63_;
-	gboolean _tmp64_;
-	PluginsModuleRep* _tmp72_;
-	SpitModule* _tmp73_;
+	SpitModule* _tmp63_;
+	const gchar* _tmp64_;
+	PluginsModuleRep* _tmp65_;
+	SpitModule* _tmp66_;
+	const gchar* _tmp67_;
+	PluginsModuleRep* _tmp68_;
+	const gchar* _tmp69_;
+	gchar* _tmp70_;
+	gchar* _tmp71_;
+	GeeHashMap* _tmp72_;
+	PluginsModuleRep* _tmp73_;
 	const gchar* _tmp74_;
 	PluginsModuleRep* _tmp75_;
-	SpitModule* _tmp76_;
-	const gchar* _tmp77_;
-	PluginsModuleRep* _tmp78_;
-	const gchar* _tmp79_;
-	GFile* _tmp80_;
-	gchar* _tmp81_;
-	gchar* _tmp82_;
-	GeeHashMap* _tmp83_;
-	PluginsModuleRep* _tmp84_;
-	const gchar* _tmp85_;
-	PluginsModuleRep* _tmp86_;
-	PluginsModuleRep* _tmp87_;
-	SpitModule* _tmp88_;
-	gint _tmp89_;
-	SpitPluggable** _tmp90_;
+	PluginsModuleRep* _tmp76_;
+	SpitModule* _tmp77_;
+	gint _tmp78_;
+	SpitPluggable** _tmp79_;
 #line 353 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	g_return_if_fail (G_IS_FILE (file));
 #line 354 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = file;
-#line 354 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = plugins_module_rep_open (_tmp0_);
+	_tmp0_ = plugins_module_rep_open (file);
 #line 354 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	module_rep = _tmp1_;
+	module_rep = _tmp0_;
 #line 355 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp2_ = module_rep;
+	_tmp1_ = module_rep;
 #line 355 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp2_ == NULL) {
-#line 3987 "Plugins.c"
-		GFile* _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-		const gchar* _tmp6_;
+	if (_tmp1_ == NULL) {
+#line 4155 "Plugins.c"
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		const gchar* _tmp4_;
 #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp3_ = file;
+		_tmp2_ = g_file_get_path (file);
 #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp4_ = g_file_get_path (_tmp3_);
-#line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp5_ = _tmp4_;
+		_tmp3_ = _tmp2_;
 #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp6_ = g_module_error ();
+		_tmp4_ = g_module_error ();
 #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		g_critical ("Plugins.vala:356: Unable to load module %s: %s", _tmp5_, _tmp6_);
+		g_critical ("Plugins.vala:356: Unable to load module %s: %s", _tmp3_, _tmp4_);
 #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp3_);
 #line 358 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_module_rep_unref0 (module_rep);
 #line 358 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4008 "Plugins.c"
+#line 4173 "Plugins.c"
 	}
 #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp7_ = module_rep;
+	_tmp5_ = module_rep;
 #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp8_ = _tmp7_->module;
+	_tmp6_ = _tmp5_->module;
 #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp10_ = g_module_symbol (_tmp8_, SPIT_ENTRY_POINT_NAME, &_tmp9_);
+	_tmp8_ = g_module_symbol (_tmp6_, SPIT_ENTRY_POINT_NAME, &_tmp7_);
 #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	entry = _tmp9_;
+	entry = _tmp7_;
 #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (!_tmp10_) {
-#line 4020 "Plugins.c"
-		GFile* _tmp11_;
-		gchar* _tmp12_;
-		gchar* _tmp13_;
+	if (!_tmp8_) {
+#line 4185 "Plugins.c"
+		gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp11_ = file;
+		_tmp9_ = g_file_get_path (file);
 #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp12_ = g_file_get_path (_tmp11_);
-#line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp13_ = _tmp12_;
+		_tmp10_ = _tmp9_;
 #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_critical ("Plugins.vala:364: Unable to load module %s: well-known entry point %s " \
-"not found", _tmp13_, SPIT_ENTRY_POINT_NAME);
+"not found", _tmp10_, SPIT_ENTRY_POINT_NAME);
 #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_free0 (_tmp13_);
+		_g_free0 (_tmp10_);
 #line 367 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_module_rep_unref0 (module_rep);
 #line 367 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4038 "Plugins.c"
+#line 4200 "Plugins.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp14_ = entry;
+	_tmp11_ = entry;
 #line 370 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	spit_entry_point = (SpitEntryPoint) _tmp14_;
+	spit_entry_point = (SpitEntryPoint) _tmp11_;
 #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (PLUGINS_MIN_SPIT_INTERFACE <= SPIT_CURRENT_INTERFACE) {
 #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp15_ = SPIT_CURRENT_INTERFACE <= PLUGINS_MAX_SPIT_INTERFACE;
-#line 4048 "Plugins.c"
+		_tmp12_ = SPIT_CURRENT_INTERFACE <= PLUGINS_MAX_SPIT_INTERFACE;
+#line 4210 "Plugins.c"
 	} else {
 #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp15_ = FALSE;
-#line 4052 "Plugins.c"
+		_tmp12_ = FALSE;
+#line 4214 "Plugins.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_vala_assert (_tmp15_, "MIN_SPIT_INTERFACE <= Spit.CURRENT_INTERFACE && Spit.CURRENT_INTERFACE <= MAX_SPIT_INTERFACE");
+	_vala_assert (_tmp12_, "MIN_SPIT_INTERFACE <= Spit.CURRENT_INTERFACE && Spit.CURRENT_INTERFACE <= MAX_SPIT_INTERFACE");
 #line 373 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	memset (&params, 0, sizeof (SpitEntryPointParams));
 #line 374 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -4063,344 +4225,323 @@ void plugins_load_module (GFile* file) {
 #line 376 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	params.module_spit_interface = SPIT_UNSUPPORTED_INTERFACE;
 #line 377 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp16_ = file;
-#line 377 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp17_ = _g_object_ref0 (_tmp16_);
+	_tmp13_ = _g_object_ref0 (file);
 #line 377 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_object_unref0 (params.module_file);
 #line 377 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	params.module_file = _tmp17_;
+	params.module_file = _tmp13_;
 #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp18_ = module_rep;
+	_tmp14_ = module_rep;
 #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp19_ = spit_entry_point;
+	_tmp15_ = spit_entry_point;
 #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp20_ = _tmp19_ (&params);
+	_tmp16_ = _tmp15_ (&params);
 #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_g_object_unref0 (_tmp18_->spit_module);
+	_g_object_unref0 (_tmp14_->spit_module);
 #line 379 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp18_->spit_module = _tmp20_;
+	_tmp14_->spit_module = _tmp16_;
 #line 380 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp21_ = params;
+	_tmp17_ = params;
 #line 380 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp22_ = _tmp21_.module_spit_interface;
+	_tmp18_ = _tmp17_.module_spit_interface;
 #line 380 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp22_ == SPIT_UNSUPPORTED_INTERFACE) {
-#line 4088 "Plugins.c"
-		GFile* _tmp23_;
-		gchar* _tmp24_;
-		gchar* _tmp25_;
-#line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp23_ = file;
+	if (_tmp18_ == SPIT_UNSUPPORTED_INTERFACE) {
+#line 4248 "Plugins.c"
+		gchar* _tmp19_;
+		gchar* _tmp20_;
 #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp24_ = g_file_get_path (_tmp23_);
+		_tmp19_ = g_file_get_path (file);
 #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp25_ = _tmp24_;
+		_tmp20_ = _tmp19_;
 #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_critical ("Plugins.vala:381: Unable to load module %s: module reports no support " \
-"for SPIT interfaces %d to %d", _tmp25_, PLUGINS_MIN_SPIT_INTERFACE, PLUGINS_MAX_SPIT_INTERFACE);
+"for SPIT interfaces %d to %d", _tmp20_, PLUGINS_MIN_SPIT_INTERFACE, PLUGINS_MAX_SPIT_INTERFACE);
 #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_free0 (_tmp25_);
+		_g_free0 (_tmp20_);
 #line 384 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		spit_entry_point_params_destroy (&params);
 #line 384 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_module_rep_unref0 (module_rep);
 #line 384 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4108 "Plugins.c"
+#line 4265 "Plugins.c"
 	}
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp27_ = params;
+	_tmp22_ = params;
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp28_ = _tmp27_.module_spit_interface;
+	_tmp23_ = _tmp22_.module_spit_interface;
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp28_ < PLUGINS_MIN_SPIT_INTERFACE) {
+	if (_tmp23_ < PLUGINS_MIN_SPIT_INTERFACE) {
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp26_ = TRUE;
-#line 4118 "Plugins.c"
+		_tmp21_ = TRUE;
+#line 4275 "Plugins.c"
 	} else {
-		SpitEntryPointParams _tmp29_;
-		gint _tmp30_;
+		SpitEntryPointParams _tmp24_;
+		gint _tmp25_;
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp29_ = params;
+		_tmp24_ = params;
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp30_ = _tmp29_.module_spit_interface;
+		_tmp25_ = _tmp24_.module_spit_interface;
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp26_ = _tmp30_ > PLUGINS_MAX_SPIT_INTERFACE;
-#line 4128 "Plugins.c"
+		_tmp21_ = _tmp25_ > PLUGINS_MAX_SPIT_INTERFACE;
+#line 4285 "Plugins.c"
 	}
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp26_) {
-#line 4132 "Plugins.c"
-		GFile* _tmp31_;
-		gchar* _tmp32_;
-		gchar* _tmp33_;
-		PluginsModuleRep* _tmp34_;
-		gint _tmp35_;
-#line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp31_ = file;
+	if (_tmp21_) {
+#line 4289 "Plugins.c"
+		gchar* _tmp26_;
+		gchar* _tmp27_;
+		PluginsModuleRep* _tmp28_;
+		gint _tmp29_;
 #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp32_ = g_file_get_path (_tmp31_);
+		_tmp26_ = g_file_get_path (file);
 #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp33_ = _tmp32_;
+		_tmp27_ = _tmp26_;
 #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp34_ = module_rep;
+		_tmp28_ = module_rep;
 #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp35_ = _tmp34_->spit_interface;
+		_tmp29_ = _tmp28_->spit_interface;
 #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_critical ("Plugins.vala:388: Unable to load module %s: module reports unsupported" \
-" SPIT version %d (out of range %d to %d)", _tmp33_, _tmp35_, PLUGINS_MIN_SPIT_INTERFACE, PLUGINS_MAX_SPIT_INTERFACE);
+" SPIT version %d (out of range %d to %d)", _tmp27_, _tmp29_, PLUGINS_MIN_SPIT_INTERFACE, PLUGINS_MAX_SPIT_INTERFACE);
 #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_free0 (_tmp33_);
+		_g_free0 (_tmp27_);
 #line 391 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		spit_entry_point_params_destroy (&params);
 #line 391 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_module_rep_unref0 (module_rep);
 #line 391 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4158 "Plugins.c"
+#line 4312 "Plugins.c"
 	}
 #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp36_ = module_rep;
+	_tmp30_ = module_rep;
 #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp37_ = params;
+	_tmp31_ = params;
 #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp38_ = _tmp37_.module_spit_interface;
+	_tmp32_ = _tmp31_.module_spit_interface;
 #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp36_->spit_interface = _tmp38_;
+	_tmp30_->spit_interface = _tmp32_;
 #line 397 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp39_ = module_rep;
+	_tmp33_ = module_rep;
 #line 397 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp40_ = _tmp39_->spit_module;
+	_tmp34_ = _tmp33_->spit_module;
 #line 397 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SPIT_TYPE_MODULE)) {
-#line 4174 "Plugins.c"
-		PluginsModuleRep* _tmp41_;
+	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, SPIT_TYPE_MODULE)) {
+#line 4328 "Plugins.c"
+		PluginsModuleRep* _tmp35_;
 #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp41_ = module_rep;
+		_tmp35_ = module_rep;
 #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_object_unref0 (_tmp41_->spit_module);
+		_g_object_unref0 (_tmp35_->spit_module);
 #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp41_->spit_module = NULL;
-#line 4182 "Plugins.c"
+		_tmp35_->spit_module = NULL;
+#line 4336 "Plugins.c"
 	}
 #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp42_ = module_rep;
+	_tmp36_ = module_rep;
 #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp43_ = _tmp42_->spit_module;
+	_tmp37_ = _tmp36_->spit_module;
 #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp43_ == NULL) {
-#line 4190 "Plugins.c"
-		GFile* _tmp44_;
-		gchar* _tmp45_;
-		gchar* _tmp46_;
-		PluginsModuleRep* _tmp47_;
-		gint _tmp48_;
+	if (_tmp37_ == NULL) {
+#line 4344 "Plugins.c"
+		gchar* _tmp38_;
+		gchar* _tmp39_;
+		PluginsModuleRep* _tmp40_;
+		gint _tmp41_;
 #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp44_ = file;
+		_tmp38_ = g_file_get_path (file);
 #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp45_ = g_file_get_path (_tmp44_);
+		_tmp39_ = _tmp38_;
 #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp46_ = _tmp45_;
+		_tmp40_ = module_rep;
 #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp47_ = module_rep;
-#line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp48_ = _tmp47_->spit_interface;
+		_tmp41_ = _tmp40_->spit_interface;
 #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_critical ("Plugins.vala:401: Unable to load module %s (SPIT %d): no spit module r" \
-"eturned", _tmp46_, _tmp48_);
+"eturned", _tmp39_, _tmp41_);
 #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_free0 (_tmp46_);
+		_g_free0 (_tmp39_);
 #line 404 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		spit_entry_point_params_destroy (&params);
 #line 404 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_module_rep_unref0 (module_rep);
 #line 404 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4216 "Plugins.c"
+#line 4367 "Plugins.c"
 	}
 #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp49_ = module_rep;
+	_tmp42_ = module_rep;
 #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp50_ = module_rep;
+	_tmp43_ = module_rep;
 #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp51_ = _tmp50_->spit_module;
+	_tmp44_ = _tmp43_->spit_module;
 #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp52_ = spit_module_get_id (_tmp51_);
+	_tmp45_ = spit_module_get_id (_tmp44_);
 #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp53_ = prepare_input_text (_tmp52_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1);
+	_tmp46_ = prepare_input_text (_tmp45_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1);
 #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_g_free0 (_tmp49_->id);
+	_g_free0 (_tmp42_->id);
 #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp49_->id = _tmp53_;
+	_tmp42_->id = _tmp46_;
 #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp54_ = module_rep;
+	_tmp47_ = module_rep;
 #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp55_ = _tmp54_->id;
+	_tmp48_ = _tmp47_->id;
 #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp55_ == NULL) {
-#line 4238 "Plugins.c"
-		GFile* _tmp56_;
-		gchar* _tmp57_;
-		gchar* _tmp58_;
-		PluginsModuleRep* _tmp59_;
-		gint _tmp60_;
+	if (_tmp48_ == NULL) {
+#line 4389 "Plugins.c"
+		gchar* _tmp49_;
+		gchar* _tmp50_;
+		PluginsModuleRep* _tmp51_;
+		gint _tmp52_;
 #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp56_ = file;
+		_tmp49_ = g_file_get_path (file);
 #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp57_ = g_file_get_path (_tmp56_);
+		_tmp50_ = _tmp49_;
 #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp58_ = _tmp57_;
+		_tmp51_ = module_rep;
 #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp59_ = module_rep;
-#line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp60_ = _tmp59_->spit_interface;
+		_tmp52_ = _tmp51_->spit_interface;
 #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_critical ("Plugins.vala:411: Unable to load module %s (SPIT %d): invalid or empty" \
-" module name", _tmp58_, _tmp60_);
+" module name", _tmp50_, _tmp52_);
 #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_free0 (_tmp58_);
+		_g_free0 (_tmp50_);
 #line 414 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		spit_entry_point_params_destroy (&params);
 #line 414 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_module_rep_unref0 (module_rep);
 #line 414 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4264 "Plugins.c"
+#line 4412 "Plugins.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp61_ = plugins_module_table;
-#line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp62_ = module_rep;
+	_tmp53_ = plugins_module_table;
 #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp63_ = _tmp62_->id;
+	_tmp54_ = module_rep;
 #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp64_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp63_);
+	_tmp55_ = _tmp54_->id;
 #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	if (_tmp64_) {
-#line 4276 "Plugins.c"
-		GFile* _tmp65_;
-		gchar* _tmp66_;
-		gchar* _tmp67_;
-		PluginsModuleRep* _tmp68_;
-		gint _tmp69_;
-		PluginsModuleRep* _tmp70_;
-		const gchar* _tmp71_;
-#line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp65_ = file;
+	if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp55_)) {
+#line 4422 "Plugins.c"
+		gchar* _tmp56_;
+		gchar* _tmp57_;
+		PluginsModuleRep* _tmp58_;
+		gint _tmp59_;
+		PluginsModuleRep* _tmp60_;
+		const gchar* _tmp61_;
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp66_ = g_file_get_path (_tmp65_);
+		_tmp56_ = g_file_get_path (file);
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp67_ = _tmp66_;
+		_tmp57_ = _tmp56_;
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp68_ = module_rep;
+		_tmp58_ = module_rep;
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp69_ = _tmp68_->spit_interface;
+		_tmp59_ = _tmp58_->spit_interface;
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp70_ = module_rep;
+		_tmp60_ = module_rep;
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp71_ = _tmp70_->id;
+		_tmp61_ = _tmp60_->id;
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		g_critical ("Plugins.vala:418: Not loading module %s (SPIT %d): module with name \"" \
-"%s\" already loaded", _tmp67_, _tmp69_, _tmp71_);
+"%s\" already loaded", _tmp57_, _tmp59_, _tmp61_);
 #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_g_free0 (_tmp67_);
+		_g_free0 (_tmp57_);
 #line 421 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		spit_entry_point_params_destroy (&params);
 #line 421 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_module_rep_unref0 (module_rep);
 #line 421 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return;
-#line 4308 "Plugins.c"
+#line 4451 "Plugins.c"
 	}
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp72_ = module_rep;
+	_tmp62_ = module_rep;
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp73_ = _tmp72_->spit_module;
+	_tmp63_ = _tmp62_->spit_module;
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp74_ = spit_module_get_module_name (_tmp73_);
+	_tmp64_ = spit_module_get_module_name (_tmp63_);
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp75_ = module_rep;
+	_tmp65_ = module_rep;
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp76_ = _tmp75_->spit_module;
+	_tmp66_ = _tmp65_->spit_module;
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp77_ = spit_module_get_version (_tmp76_);
+	_tmp67_ = spit_module_get_version (_tmp66_);
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp78_ = module_rep;
+	_tmp68_ = module_rep;
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp79_ = _tmp78_->id;
+	_tmp69_ = _tmp68_->id;
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp80_ = file;
+	_tmp70_ = g_file_get_path (file);
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp81_ = g_file_get_path (_tmp80_);
+	_tmp71_ = _tmp70_;
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp82_ = _tmp81_;
+	g_debug ("Plugins.vala:424: Loaded SPIT module \"%s %s\" (%s) [%s]", _tmp64_, _tmp67_, _tmp69_, _tmp71_);
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	g_debug ("Plugins.vala:424: Loaded SPIT module \"%s %s\" (%s) [%s]", _tmp74_, _tmp77_, _tmp79_, _tmp82_);
-#line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_g_free0 (_tmp82_);
+	_g_free0 (_tmp71_);
 #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp83_ = plugins_module_table;
+	_tmp72_ = plugins_module_table;
 #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp84_ = module_rep;
+	_tmp73_ = module_rep;
 #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp85_ = _tmp84_->id;
+	_tmp74_ = _tmp73_->id;
 #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp86_ = module_rep;
+	_tmp75_ = module_rep;
 #line 428 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp85_, _tmp86_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp74_, _tmp75_);
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp87_ = module_rep;
+	_tmp76_ = module_rep;
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp88_ = _tmp87_->spit_module;
+	_tmp77_ = _tmp76_->spit_module;
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp90_ = spit_module_get_pluggables (_tmp88_, &_tmp89_);
-#line 4352 "Plugins.c"
+	_tmp79_ = spit_module_get_pluggables (_tmp77_, &_tmp78_);
+#line 4493 "Plugins.c"
 	{
 		SpitPluggable** pluggable_collection = NULL;
 		gint pluggable_collection_length1 = 0;
 		gint _pluggable_collection_size_ = 0;
 		gint pluggable_it = 0;
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		pluggable_collection = _tmp90_;
+		pluggable_collection = _tmp79_;
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		pluggable_collection_length1 = _tmp89_;
+		pluggable_collection_length1 = _tmp78_;
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		for (pluggable_it = 0; pluggable_it < _tmp89_; pluggable_it = pluggable_it + 1) {
-#line 4364 "Plugins.c"
-			SpitPluggable* _tmp91_;
+		for (pluggable_it = 0; pluggable_it < _tmp78_; pluggable_it = pluggable_it + 1) {
+#line 4505 "Plugins.c"
+			SpitPluggable* _tmp80_;
 			SpitPluggable* pluggable = NULL;
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp91_ = _g_object_ref0 (pluggable_collection[pluggable_it]);
+			_tmp80_ = _g_object_ref0 (pluggable_collection[pluggable_it]);
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			pluggable = _tmp91_;
-#line 4371 "Plugins.c"
+			pluggable = _tmp80_;
+#line 4512 "Plugins.c"
 			{
-				GeeHashMap* _tmp92_;
-				SpitPluggable* _tmp93_;
-				const gchar* _tmp94_;
-				SpitPluggable* _tmp95_;
-				PluginsPluggableRep* _tmp96_;
-				PluginsPluggableRep* _tmp97_;
+				GeeHashMap* _tmp81_;
+				SpitPluggable* _tmp82_;
+				const gchar* _tmp83_;
+				SpitPluggable* _tmp84_;
+				PluginsPluggableRep* _tmp85_;
+				PluginsPluggableRep* _tmp86_;
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp92_ = plugins_pluggable_table;
+				_tmp81_ = plugins_pluggable_table;
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp93_ = pluggable;
+				_tmp82_ = pluggable;
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp94_ = spit_pluggable_get_id (_tmp93_);
+				_tmp83_ = spit_pluggable_get_id (_tmp82_);
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp95_ = pluggable;
+				_tmp84_ = pluggable;
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp96_ = plugins_pluggable_rep_new (_tmp95_);
+				_tmp85_ = plugins_pluggable_rep_new (_tmp84_);
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_tmp97_ = _tmp96_;
+				_tmp86_ = _tmp85_;
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp94_, _tmp97_);
+				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp83_, _tmp86_);
 #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-				_plugins_pluggable_rep_unref0 (_tmp97_);
+				_plugins_pluggable_rep_unref0 (_tmp86_);
 #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_g_object_unref0 (pluggable);
-#line 4397 "Plugins.c"
+#line 4538 "Plugins.c"
 			}
 		}
 	}
@@ -4408,11 +4549,15 @@ void plugins_load_module (GFile* file) {
 	spit_entry_point_params_destroy (&params);
 #line 353 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_module_rep_unref0 (module_rep);
-#line 4405 "Plugins.c"
+#line 4546 "Plugins.c"
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -4424,7 +4569,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }