diff options
Diffstat (limited to 'src/config/GSettingsEngine.c')
| -rw-r--r-- | src/config/GSettingsEngine.c | 2750 | 
1 files changed, 1286 insertions, 1464 deletions
| diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c index 4f637b2..3ddaa71 100644 --- a/src/config/GSettingsEngine.c +++ b/src/config/GSettingsEngine.c @@ -1,4 +1,4 @@ -/* GSettingsEngine.c generated by valac 0.36.6, the Vala compiler +/* GSettingsEngine.c generated by valac 0.40.4, the Vala compiler   * generated from GSettingsEngine.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@   * See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <stdlib.h> @@ -38,6 +39,11 @@ typedef struct _ConfigurationEngineIface ConfigurationEngineIface;  typedef struct _GSettingsConfigurationEngine GSettingsConfigurationEngine;  typedef struct _GSettingsConfigurationEngineClass GSettingsConfigurationEngineClass;  typedef struct _GSettingsConfigurationEnginePrivate GSettingsConfigurationEnginePrivate; +enum  { +	GSETTINGS_CONFIGURATION_ENGINE_0_PROPERTY, +	GSETTINGS_CONFIGURATION_ENGINE_NUM_PROPERTIES +}; +static GParamSpec* gsettings_configuration_engine_properties[GSETTINGS_CONFIGURATION_ENGINE_NUM_PROPERTIES];  #define _g_free0(var) (var = (g_free (var), NULL))  #define _g_settings_schema_unref0(var) ((var == NULL) ? NULL : (var = (g_settings_schema_unref (var), NULL)))  #define _g_settings_schema_source_unref0(var) ((var == NULL) ? NULL : (var = (g_settings_schema_source_unref (var), NULL))) @@ -185,9 +191,6 @@ GType fuzzy_property_state_get_type (void) G_GNUC_CONST;  GType configuration_engine_get_type (void) G_GNUC_CONST;  GType gsettings_configuration_engine_get_type (void) G_GNUC_CONST;  #define GSETTINGS_CONFIGURATION_ENGINE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEnginePrivate)) -enum  { -	GSETTINGS_CONFIGURATION_ENGINE_DUMMY_PROPERTY -};  #define GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME "org.yorba.shotwell"  #define GSETTINGS_CONFIGURATION_ENGINE_PREFS_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME ".preferences"  #define GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_PREFS_SCHEMA_NAME ".ui" @@ -206,53 +209,164 @@ enum  {  #define GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME ".plugins.enable-state"  GSettingsConfigurationEngine* gsettings_configuration_engine_new (void);  GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType object_type); -static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gboolean value, GError** error); -static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error); -static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error); -static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static void gsettings_configuration_engine_set_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gdouble value, GError** error); -static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); -static void gsettings_configuration_engine_set_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, const gchar* value, GError** error); -static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error); +static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, +                                                     const gchar* schema, +                                                     const gchar* key, +                                                     GError** error); +static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, +                                                     const gchar* schema, +                                                     const gchar* key, +                                                     GError** error); +static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, +                                                 const gchar* schema, +                                                 const gchar* key, +                                                 gboolean value, +                                                 GError** error); +static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, +                                                 const gchar* schema, +                                                 const gchar* key, +                                                 gint value, +                                                 GError** error); +static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, +                                                 const gchar* schema, +                                                 const gchar* key, +                                                 GError** error); +static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, +                                                const gchar* schema, +                                                const gchar* key, +                                                GError** error); +static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, +                                                const gchar* schema, +                                                const gchar* key, +                                                gint value, +                                                GError** error); +static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, +                                                      const gchar* schema, +                                                      const gchar* key, +                                                      GError** error); +static void gsettings_configuration_engine_set_gs_double (GSettingsConfigurationEngine* self, +                                                   const gchar* schema, +                                                   const gchar* key, +                                                   gdouble value, +                                                   GError** error); +static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurationEngine* self, +                                                     const gchar* schema, +                                                     const gchar* key, +                                                     GError** error); +static void gsettings_configuration_engine_set_gs_string (GSettingsConfigurationEngine* self, +                                                   const gchar* schema, +                                                   const gchar* key, +                                                   const gchar* value, +                                                   GError** error); +static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigurationEngine* self, +                                                         const gchar* schema, +                                                         const gchar* key, +                                                         GError** error);  static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id);  gboolean is_string_empty (const gchar* s);  static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (const gchar* id); -static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, const gchar* id); +static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, +                                                               const gchar* id);  static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gconf_key);  static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine* base); -static gint gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error); -static gint gsettings_configuration_engine_real_get_int_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error); -static gchar* gsettings_configuration_engine_real_get_string_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_string_property (ConfigurationEngine* base, ConfigurableProperty p, const gchar* val, GError** error); -static gboolean gsettings_configuration_engine_real_get_bool_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_bool_property (ConfigurationEngine* base, ConfigurableProperty p, gboolean val, GError** error); -static gdouble gsettings_configuration_engine_real_get_double_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error); -static void gsettings_configuration_engine_real_set_double_property (ConfigurationEngine* base, ConfigurableProperty p, gdouble val, GError** error); -static gboolean gsettings_configuration_engine_real_get_plugin_bool (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gboolean def); -static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gboolean val); -static gdouble gsettings_configuration_engine_real_get_plugin_double (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gdouble def); -static void gsettings_configuration_engine_real_set_plugin_double (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gdouble val); -static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gint def); -static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gint val); -static gchar* gsettings_configuration_engine_real_get_plugin_string (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, const gchar* def); -static void gsettings_configuration_engine_real_set_plugin_string (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, const gchar* val); -static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key); -static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled (ConfigurationEngine* base, const gchar* id); -static void gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, const gchar* id, gboolean enabled); +static gint gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, +                                                            ConfigurableProperty p, +                                                            GError** error); +static void gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, +                                                            ConfigurableProperty p, +                                                            gint val, +                                                            GError** error); +static gint gsettings_configuration_engine_real_get_int_property (ConfigurationEngine* base, +                                                           ConfigurableProperty p, +                                                           GError** error); +static void gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, +                                                           ConfigurableProperty p, +                                                           gint val, +                                                           GError** error); +static gchar* gsettings_configuration_engine_real_get_string_property (ConfigurationEngine* base, +                                                                ConfigurableProperty p, +                                                                GError** error); +static void gsettings_configuration_engine_real_set_string_property (ConfigurationEngine* base, +                                                              ConfigurableProperty p, +                                                              const gchar* val, +                                                              GError** error); +static gboolean gsettings_configuration_engine_real_get_bool_property (ConfigurationEngine* base, +                                                                ConfigurableProperty p, +                                                                GError** error); +static void gsettings_configuration_engine_real_set_bool_property (ConfigurationEngine* base, +                                                            ConfigurableProperty p, +                                                            gboolean val, +                                                            GError** error); +static gdouble gsettings_configuration_engine_real_get_double_property (ConfigurationEngine* base, +                                                                 ConfigurableProperty p, +                                                                 GError** error); +static void gsettings_configuration_engine_real_set_double_property (ConfigurationEngine* base, +                                                              ConfigurableProperty p, +                                                              gdouble val, +                                                              GError** error); +static gboolean gsettings_configuration_engine_real_get_plugin_bool (ConfigurationEngine* base, +                                                              const gchar* domain, +                                                              const gchar* id, +                                                              const gchar* key, +                                                              gboolean def); +static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEngine* base, +                                                          const gchar* domain, +                                                          const gchar* id, +                                                          const gchar* key, +                                                          gboolean val); +static gdouble gsettings_configuration_engine_real_get_plugin_double (ConfigurationEngine* base, +                                                               const gchar* domain, +                                                               const gchar* id, +                                                               const gchar* key, +                                                               gdouble def); +static void gsettings_configuration_engine_real_set_plugin_double (ConfigurationEngine* base, +                                                            const gchar* domain, +                                                            const gchar* id, +                                                            const gchar* key, +                                                            gdouble val); +static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEngine* base, +                                                         const gchar* domain, +                                                         const gchar* id, +                                                         const gchar* key, +                                                         gint def); +static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEngine* base, +                                                         const gchar* domain, +                                                         const gchar* id, +                                                         const gchar* key, +                                                         gint val); +static gchar* gsettings_configuration_engine_real_get_plugin_string (ConfigurationEngine* base, +                                                              const gchar* domain, +                                                              const gchar* id, +                                                              const gchar* key, +                                                              const gchar* def); +static void gsettings_configuration_engine_real_set_plugin_string (ConfigurationEngine* base, +                                                            const gchar* domain, +                                                            const gchar* id, +                                                            const gchar* key, +                                                            const gchar* val); +static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationEngine* base, +                                                           const gchar* domain, +                                                           const gchar* id, +                                                           const gchar* key); +static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled (ConfigurationEngine* base, +                                                                          const gchar* id); +static void gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, +                                                             const gchar* id, +                                                             gboolean enabled);  void gsettings_configuration_engine_run_gsettings_migrator (void);  GFile* app_dirs_get_settings_migrator_bin (void);  static void gsettings_configuration_engine_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static 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); -GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType object_type) { +GSettingsConfigurationEngine* +gsettings_configuration_engine_construct (GType object_type) +{  	GSettingsConfigurationEngine * self = NULL;  	gchar** _tmp0_;  	gchar** _tmp1_; @@ -2552,36 +2666,42 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob  	_tmp427_ = _tmp425_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE];  #line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return self; -#line 2556 "GSettingsEngine.c" +#line 2670 "GSettingsEngine.c"  } -GSettingsConfigurationEngine* gsettings_configuration_engine_new (void) { +GSettingsConfigurationEngine* +gsettings_configuration_engine_new (void) +{  #line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return gsettings_configuration_engine_construct (TYPE_GSETTINGS_CONFIGURATION_ENGINE); -#line 2563 "GSettingsEngine.c" +#line 2679 "GSettingsEngine.c"  } -static gpointer _g_settings_schema_source_ref0 (gpointer self) { +static gpointer +_g_settings_schema_source_ref0 (gpointer self) +{  #line 180 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return self ? g_settings_schema_source_ref (self) : NULL; -#line 2570 "GSettingsEngine.c" +#line 2688 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static void +gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, +                                                const gchar* schema, +                                                const gchar* key, +                                                GError** error) +{  	GSettingsSchemaSource* schema_source = NULL;  	GSettingsSchemaSource* _tmp0_;  	GSettingsSchemaSource* _tmp1_;  	GSettingsSchema* settings_scheme = NULL;  	GSettingsSchemaSource* _tmp2_; -	const gchar* _tmp3_; +	GSettingsSchema* _tmp3_;  	GSettingsSchema* _tmp4_; -	GSettingsSchema* _tmp5_; -	GSettingsSchema* _tmp11_; -	const gchar* _tmp12_; -	gboolean _tmp13_; +	GSettingsSchema* _tmp9_;  	GError * _inner_error_ = NULL;  #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -2598,35 +2718,30 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati  #line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp2_ = schema_source;  #line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = schema; -#line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = g_settings_schema_source_lookup (_tmp2_, _tmp3_, TRUE); +	_tmp3_ = g_settings_schema_source_lookup (_tmp2_, schema, TRUE);  #line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	settings_scheme = _tmp4_; +	settings_scheme = _tmp3_;  #line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = settings_scheme; +	_tmp4_ = settings_scheme;  #line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	if (_tmp5_ == NULL) { -#line 2611 "GSettingsEngine.c" -		const gchar* _tmp6_; -		gchar* _tmp7_; -		gchar* _tmp8_; -		GError* _tmp9_; -		GError* _tmp10_; -#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = schema; +	if (_tmp4_ == NULL) { +#line 2729 "GSettingsEngine.c" +		gchar* _tmp5_; +		gchar* _tmp6_; +		GError* _tmp7_; +		GError* _tmp8_;  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = g_strdup_printf ("schema '%s' is not installed", _tmp6_); +		_tmp5_ = g_strdup_printf ("schema '%s' is not installed", schema);  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp8_ = _tmp7_; +		_tmp6_ = _tmp5_;  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp9_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp8_); +		_tmp7_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp6_);  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp10_ = _tmp9_; +		_tmp8_ = _tmp7_;  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp8_); +		_g_free0 (_tmp6_);  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_inner_error_ = _tmp10_; +		_inner_error_ = _tmp8_;  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) {  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2637,7 +2752,7 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati  			_g_settings_schema_source_unref0 (schema_source);  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 2641 "GSettingsEngine.c" +#line 2756 "GSettingsEngine.c"  		} else {  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			_g_settings_schema_unref0 (settings_scheme); @@ -2649,40 +2764,30 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati  			g_clear_error (&_inner_error_);  #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 2653 "GSettingsEngine.c" +#line 2768 "GSettingsEngine.c"  		}  	}  #line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp11_ = settings_scheme; -#line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp12_ = key; +	_tmp9_ = settings_scheme;  #line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp13_ = g_settings_schema_has_key (_tmp11_, _tmp12_); -#line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	if (!_tmp13_) { -#line 2664 "GSettingsEngine.c" -		const gchar* _tmp14_; -		const gchar* _tmp15_; -		gchar* _tmp16_; -		gchar* _tmp17_; -		GError* _tmp18_; -		GError* _tmp19_; -#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp14_ = schema; +	if (!g_settings_schema_has_key (_tmp9_, key)) { +#line 2775 "GSettingsEngine.c" +		gchar* _tmp10_; +		gchar* _tmp11_; +		GError* _tmp12_; +		GError* _tmp13_;  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp15_ = key; +		_tmp10_ = g_strdup_printf ("schema '%s' does not define key '%s'", schema, key);  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp16_ = g_strdup_printf ("schema '%s' does not define key '%s'", _tmp14_, _tmp15_); +		_tmp11_ = _tmp10_;  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp17_ = _tmp16_; +		_tmp12_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp11_);  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp18_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp17_); +		_tmp13_ = _tmp12_;  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp19_ = _tmp18_; -#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp17_); +		_g_free0 (_tmp11_);  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_inner_error_ = _tmp19_; +		_inner_error_ = _tmp13_;  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) {  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2693,7 +2798,7 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati  			_g_settings_schema_source_unref0 (schema_source);  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 2697 "GSettingsEngine.c" +#line 2802 "GSettingsEngine.c"  		} else {  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			_g_settings_schema_unref0 (settings_scheme); @@ -2705,27 +2810,27 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati  			g_clear_error (&_inner_error_);  #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 2709 "GSettingsEngine.c" +#line 2814 "GSettingsEngine.c"  		}  	}  #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_settings_schema_unref0 (settings_scheme);  #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_settings_schema_source_unref0 (schema_source); -#line 2716 "GSettingsEngine.c" +#line 2821 "GSettingsEngine.c"  } -static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gboolean +gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, +                                            const gchar* schema, +                                            const gchar* key, +                                            GError** error) +{  	gboolean result = FALSE; -	const gchar* _tmp0_; -	const gchar* _tmp1_;  	GSettings* schema_object = NULL; -	const gchar* _tmp4_; -	GSettings* _tmp5_; -	GSettings* _tmp6_; -	const gchar* _tmp7_; -	gboolean _tmp8_; +	GSettings* _tmp2_; +	GSettings* _tmp3_;  	GError * _inner_error_ = NULL;  #line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), FALSE); @@ -2734,64 +2839,55 @@ static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurati  #line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (key != NULL, FALSE);  #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2747 "GSettingsEngine.c" -			gboolean _tmp2_ = FALSE; +#line 2848 "GSettingsEngine.c" +			gboolean _tmp0_ = FALSE;  #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_propagate_error (error, _inner_error_);  #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp2_; -#line 2753 "GSettingsEngine.c" +			return _tmp0_; +#line 2854 "GSettingsEngine.c"  		} else { -			gboolean _tmp3_ = FALSE; +			gboolean _tmp1_ = FALSE;  #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);  #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp3_; -#line 2762 "GSettingsEngine.c" +			return _tmp1_; +#line 2863 "GSettingsEngine.c"  		}  	}  #line 194 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema; -#line 194 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = g_settings_new (_tmp4_); +	_tmp2_ = g_settings_new (schema);  #line 194 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp5_; +	schema_object = _tmp2_;  #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = schema_object; +	_tmp3_ = schema_object;  #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = key; -#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp8_ = g_settings_get_boolean (_tmp6_, _tmp7_); -#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	result = _tmp8_; +	result = g_settings_get_boolean (_tmp3_, key);  #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object);  #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 2783 "GSettingsEngine.c" +#line 2878 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gboolean value, GError** error) { -	const gchar* _tmp0_; -	const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, +                                            const gchar* schema, +                                            const gchar* key, +                                            gboolean value, +                                            GError** error) +{  	GSettings* schema_object = NULL; -	const gchar* _tmp2_; -	GSettings* _tmp3_; -	GSettings* _tmp4_; -	const gchar* _tmp5_; -	gboolean _tmp6_; +	GSettings* _tmp0_; +	GSettings* _tmp1_;  	GError * _inner_error_ = NULL;  #line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -2800,11 +2896,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn  #line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2813,7 +2905,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn  			g_propagate_error (error, _inner_error_);  #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 2817 "GSettingsEngine.c" +#line 2909 "GSettingsEngine.c"  		} else {  #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2821,38 +2913,33 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn  			g_clear_error (&_inner_error_);  #line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 2825 "GSettingsEngine.c" +#line 2917 "GSettingsEngine.c"  		}  	}  #line 202 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = schema; +	_tmp0_ = g_settings_new (schema);  #line 202 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = g_settings_new (_tmp2_); -#line 202 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp3_; -#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema_object; -#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = key; +	schema_object = _tmp0_;  #line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = value; +	_tmp1_ = schema_object;  #line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_settings_set_boolean (_tmp4_, _tmp5_, _tmp6_); +	g_settings_set_boolean (_tmp1_, key, value);  #line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object); -#line 2844 "GSettingsEngine.c" +#line 2930 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error) { -	const gchar* _tmp0_; -	const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, +                                            const gchar* schema, +                                            const gchar* key, +                                            gint value, +                                            GError** error) +{  	GSettings* schema_object = NULL; -	const gchar* _tmp2_; -	GSettings* _tmp3_; -	GSettings* _tmp4_; -	const gchar* _tmp5_; -	gint _tmp6_; +	GSettings* _tmp0_; +	GSettings* _tmp1_;  	GError * _inner_error_ = NULL;  #line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -2861,11 +2948,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn  #line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2874,7 +2957,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn  			g_propagate_error (error, _inner_error_);  #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 2878 "GSettingsEngine.c" +#line 2961 "GSettingsEngine.c"  		} else {  #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2882,39 +2965,33 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn  			g_clear_error (&_inner_error_);  #line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 2886 "GSettingsEngine.c" +#line 2969 "GSettingsEngine.c"  		}  	}  #line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = schema; -#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = g_settings_new (_tmp2_); +	_tmp0_ = g_settings_new (schema);  #line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp3_; -#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema_object; +	schema_object = _tmp0_;  #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = key; +	_tmp1_ = schema_object;  #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = value; -#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_settings_set_enum (_tmp4_, _tmp5_, _tmp6_); +	g_settings_set_enum (_tmp1_, key, value);  #line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object); -#line 2905 "GSettingsEngine.c" +#line 2982 "GSettingsEngine.c"  } -static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gint +gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, +                                            const gchar* schema, +                                            const gchar* key, +                                            GError** error) +{  	gint result = 0; -	const gchar* _tmp0_; -	const gchar* _tmp1_;  	GSettings* schema_object = NULL; -	const gchar* _tmp4_; -	GSettings* _tmp5_; -	GSettings* _tmp6_; -	const gchar* _tmp7_; -	gint _tmp8_; +	GSettings* _tmp2_; +	GSettings* _tmp3_;  	GError * _inner_error_ = NULL;  #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0); @@ -2923,65 +3000,55 @@ static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEn  #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (key != NULL, 0);  #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2936 "GSettingsEngine.c" -			gint _tmp2_ = 0; +#line 3009 "GSettingsEngine.c" +			gint _tmp0_ = 0;  #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_propagate_error (error, _inner_error_);  #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp2_; -#line 2942 "GSettingsEngine.c" +			return _tmp0_; +#line 3015 "GSettingsEngine.c"  		} else { -			gint _tmp3_ = 0; +			gint _tmp1_ = 0;  #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);  #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp3_; -#line 2951 "GSettingsEngine.c" +			return _tmp1_; +#line 3024 "GSettingsEngine.c"  		}  	}  #line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema; -#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = g_settings_new (_tmp4_); +	_tmp2_ = g_settings_new (schema);  #line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp5_; -#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = schema_object; -#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = key; +	schema_object = _tmp2_;  #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp8_ = g_settings_get_enum (_tmp6_, _tmp7_); +	_tmp3_ = schema_object;  #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	result = _tmp8_; +	result = g_settings_get_enum (_tmp3_, key);  #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object);  #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 2972 "GSettingsEngine.c" +#line 3039 "GSettingsEngine.c"  } -static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gint +gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, +                                           const gchar* schema, +                                           const gchar* key, +                                           GError** error) +{  	gint result = 0; -	const gchar* _tmp0_; -	const gchar* _tmp1_;  	GSettings* schema_object = NULL; -	const gchar* _tmp4_; -	GSettings* _tmp5_; -	GSettings* _tmp6_; -	const gchar* _tmp7_; -	gint _tmp8_; +	GSettings* _tmp2_; +	GSettings* _tmp3_;  	GError * _inner_error_ = NULL;  #line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0); @@ -2990,64 +3057,55 @@ static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEng  #line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (key != NULL, 0);  #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3003 "GSettingsEngine.c" -			gint _tmp2_ = 0; +#line 3066 "GSettingsEngine.c" +			gint _tmp0_ = 0;  #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_propagate_error (error, _inner_error_);  #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp2_; -#line 3009 "GSettingsEngine.c" +			return _tmp0_; +#line 3072 "GSettingsEngine.c"  		} else { -			gint _tmp3_ = 0; +			gint _tmp1_ = 0;  #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);  #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp3_; -#line 3018 "GSettingsEngine.c" +			return _tmp1_; +#line 3081 "GSettingsEngine.c"  		}  	}  #line 224 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema; -#line 224 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = g_settings_new (_tmp4_); +	_tmp2_ = g_settings_new (schema);  #line 224 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp5_; -#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = schema_object; -#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = key; +	schema_object = _tmp2_;  #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp8_ = g_settings_get_int (_tmp6_, _tmp7_); +	_tmp3_ = schema_object;  #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	result = _tmp8_; +	result = g_settings_get_int (_tmp3_, key);  #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object);  #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3039 "GSettingsEngine.c" +#line 3096 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error) { -	const gchar* _tmp0_; -	const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, +                                           const gchar* schema, +                                           const gchar* key, +                                           gint value, +                                           GError** error) +{  	GSettings* schema_object = NULL; -	const gchar* _tmp2_; -	GSettings* _tmp3_; -	GSettings* _tmp4_; -	const gchar* _tmp5_; -	gint _tmp6_; +	GSettings* _tmp0_; +	GSettings* _tmp1_;  	GError * _inner_error_ = NULL;  #line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -3056,11 +3114,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng  #line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3069,7 +3123,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng  			g_propagate_error (error, _inner_error_);  #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3073 "GSettingsEngine.c" +#line 3127 "GSettingsEngine.c"  		} else {  #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3077,39 +3131,33 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng  			g_clear_error (&_inner_error_);  #line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3081 "GSettingsEngine.c" +#line 3135 "GSettingsEngine.c"  		}  	}  #line 232 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = schema; -#line 232 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = g_settings_new (_tmp2_); +	_tmp0_ = g_settings_new (schema);  #line 232 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp3_; +	schema_object = _tmp0_;  #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema_object; +	_tmp1_ = schema_object;  #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = key; -#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = value; -#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_settings_set_int (_tmp4_, _tmp5_, _tmp6_); +	g_settings_set_int (_tmp1_, key, value);  #line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object); -#line 3100 "GSettingsEngine.c" +#line 3148 "GSettingsEngine.c"  } -static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gdouble +gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, +                                              const gchar* schema, +                                              const gchar* key, +                                              GError** error) +{  	gdouble result = 0.0; -	const gchar* _tmp0_; -	const gchar* _tmp1_;  	GSettings* schema_object = NULL; -	const gchar* _tmp4_; -	GSettings* _tmp5_; -	GSettings* _tmp6_; -	const gchar* _tmp7_; -	gdouble _tmp8_; +	GSettings* _tmp2_; +	GSettings* _tmp3_;  	GError * _inner_error_ = NULL;  #line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0.0); @@ -3118,64 +3166,55 @@ static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurat  #line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (key != NULL, 0.0);  #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3131 "GSettingsEngine.c" -			gdouble _tmp2_ = 0.0; +#line 3175 "GSettingsEngine.c" +			gdouble _tmp0_ = 0.0;  #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_propagate_error (error, _inner_error_);  #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp2_; -#line 3137 "GSettingsEngine.c" +			return _tmp0_; +#line 3181 "GSettingsEngine.c"  		} else { -			gdouble _tmp3_ = 0.0; +			gdouble _tmp1_ = 0.0;  #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);  #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp3_; -#line 3146 "GSettingsEngine.c" +			return _tmp1_; +#line 3190 "GSettingsEngine.c"  		}  	}  #line 240 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema; -#line 240 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = g_settings_new (_tmp4_); +	_tmp2_ = g_settings_new (schema);  #line 240 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp5_; +	schema_object = _tmp2_;  #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = schema_object; +	_tmp3_ = schema_object;  #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = key; -#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp8_ = g_settings_get_double (_tmp6_, _tmp7_); -#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	result = _tmp8_; +	result = g_settings_get_double (_tmp3_, key);  #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object);  #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3167 "GSettingsEngine.c" +#line 3205 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_set_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gdouble value, GError** error) { -	const gchar* _tmp0_; -	const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_double (GSettingsConfigurationEngine* self, +                                              const gchar* schema, +                                              const gchar* key, +                                              gdouble value, +                                              GError** error) +{  	GSettings* schema_object = NULL; -	const gchar* _tmp2_; -	GSettings* _tmp3_; -	GSettings* _tmp4_; -	const gchar* _tmp5_; -	gdouble _tmp6_; +	GSettings* _tmp0_; +	GSettings* _tmp1_;  	GError * _inner_error_ = NULL;  #line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -3184,11 +3223,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration  #line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3197,7 +3232,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration  			g_propagate_error (error, _inner_error_);  #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3201 "GSettingsEngine.c" +#line 3236 "GSettingsEngine.c"  		} else {  #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3205,39 +3240,34 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration  			g_clear_error (&_inner_error_);  #line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3209 "GSettingsEngine.c" +#line 3244 "GSettingsEngine.c"  		}  	}  #line 248 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = schema; -#line 248 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = g_settings_new (_tmp2_); +	_tmp0_ = g_settings_new (schema);  #line 248 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp3_; +	schema_object = _tmp0_;  #line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema_object; +	_tmp1_ = schema_object;  #line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = key; -#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = value; -#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_settings_set_double (_tmp4_, _tmp5_, _tmp6_); +	g_settings_set_double (_tmp1_, key, value);  #line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object); -#line 3228 "GSettingsEngine.c" +#line 3257 "GSettingsEngine.c"  } -static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { +static gchar* +gsettings_configuration_engine_get_gs_string (GSettingsConfigurationEngine* self, +                                              const gchar* schema, +                                              const gchar* key, +                                              GError** error) +{  	gchar* result = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_;  	GSettings* schema_object = NULL; -	const gchar* _tmp2_; -	GSettings* _tmp3_; -	GSettings* _tmp4_; -	const gchar* _tmp5_; -	gchar* _tmp6_; +	GSettings* _tmp0_; +	GSettings* _tmp1_; +	gchar* _tmp2_;  	GError * _inner_error_ = NULL;  #line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), NULL); @@ -3246,11 +3276,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati  #line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (key != NULL, NULL);  #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3259,7 +3285,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati  			g_propagate_error (error, _inner_error_);  #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return NULL; -#line 3263 "GSettingsEngine.c" +#line 3289 "GSettingsEngine.c"  		} else {  #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3267,40 +3293,37 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati  			g_clear_error (&_inner_error_);  #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return NULL; -#line 3271 "GSettingsEngine.c" +#line 3297 "GSettingsEngine.c"  		}  	}  #line 256 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = schema; -#line 256 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = g_settings_new (_tmp2_); +	_tmp0_ = g_settings_new (schema);  #line 256 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp3_; +	schema_object = _tmp0_;  #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema_object; +	_tmp1_ = schema_object;  #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = key; +	_tmp2_ = g_settings_get_string (_tmp1_, key);  #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = g_settings_get_string (_tmp4_, _tmp5_); -#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	result = _tmp6_; +	result = _tmp2_;  #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object);  #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3292 "GSettingsEngine.c" +#line 3314 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_set_gs_string (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, const gchar* value, GError** error) { -	const gchar* _tmp0_; -	const gchar* _tmp1_; +static void +gsettings_configuration_engine_set_gs_string (GSettingsConfigurationEngine* self, +                                              const gchar* schema, +                                              const gchar* key, +                                              const gchar* value, +                                              GError** error) +{  	GSettings* schema_object = NULL; -	const gchar* _tmp2_; -	GSettings* _tmp3_; -	GSettings* _tmp4_; -	const gchar* _tmp5_; -	const gchar* _tmp6_; +	GSettings* _tmp0_; +	GSettings* _tmp1_;  	GError * _inner_error_ = NULL;  #line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -3311,11 +3334,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration  #line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (value != NULL);  #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3324,7 +3343,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration  			g_propagate_error (error, _inner_error_);  #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3328 "GSettingsEngine.c" +#line 3347 "GSettingsEngine.c"  		} else {  #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3332,37 +3351,32 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration  			g_clear_error (&_inner_error_);  #line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3336 "GSettingsEngine.c" +#line 3355 "GSettingsEngine.c"  		}  	}  #line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = schema; -#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = g_settings_new (_tmp2_); +	_tmp0_ = g_settings_new (schema);  #line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp3_; +	schema_object = _tmp0_;  #line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema_object; +	_tmp1_ = schema_object;  #line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = key; -#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = value; -#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_settings_set_string (_tmp4_, _tmp5_, _tmp6_); +	g_settings_set_string (_tmp1_, key, value);  #line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object); -#line 3355 "GSettingsEngine.c" +#line 3368 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) { -	const gchar* _tmp0_; -	const gchar* _tmp1_; +static void +gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigurationEngine* self, +                                                    const gchar* schema, +                                                    const gchar* key, +                                                    GError** error) +{  	GSettings* schema_object = NULL; -	const gchar* _tmp2_; -	GSettings* _tmp3_; -	GSettings* _tmp4_; -	const gchar* _tmp5_; +	GSettings* _tmp0_; +	GSettings* _tmp1_;  	GError * _inner_error_ = NULL;  #line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self)); @@ -3371,11 +3385,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu  #line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = schema; -#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = key; -#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_); +	gsettings_configuration_engine_check_key_valid (self, schema, key, &_inner_error_);  #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3384,7 +3394,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu  			g_propagate_error (error, _inner_error_);  #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3388 "GSettingsEngine.c" +#line 3398 "GSettingsEngine.c"  		} else {  #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3392,403 +3402,383 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu  			g_clear_error (&_inner_error_);  #line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3396 "GSettingsEngine.c" +#line 3406 "GSettingsEngine.c"  		}  	}  #line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = schema; +	_tmp0_ = g_settings_new (schema);  #line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = g_settings_new (_tmp2_); -#line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_object = _tmp3_; -#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = schema_object; +	schema_object = _tmp0_;  #line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = key; +	_tmp1_ = schema_object;  #line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_settings_reset (_tmp4_, _tmp5_); +	g_settings_reset (_tmp1_, key);  #line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_object_unref0 (schema_object); -#line 3413 "GSettingsEngine.c" +#line 3419 "GSettingsEngine.c"  } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, +                const gchar* old, +                const gchar* replacement) +{  	gchar* result = NULL;  	gboolean _tmp0_ = FALSE;  	gboolean _tmp1_ = FALSE;  	GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		_tmp1_ = TRUE; -#line 3432 "GSettingsEngine.c" +#line 3442 "GSettingsEngine.c"  	} else { -		const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 3439 "GSettingsEngine.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp1_ = (*((gchar*) old)) == '\0'; +#line 3446 "GSettingsEngine.c"  	} -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		_tmp0_ = TRUE; -#line 3445 "GSettingsEngine.c" +#line 3452 "GSettingsEngine.c"  	} else { -		const gchar* _tmp3_; -		const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 3455 "GSettingsEngine.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 3456 "GSettingsEngine.c"  	} -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	if (_tmp0_) { -#line 3459 "GSettingsEngine.c" -		gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 3460 "GSettingsEngine.c" +		gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		return result; -#line 3467 "GSettingsEngine.c" +#line 3468 "GSettingsEngine.c"  	}  	{  		GRegex* regex = NULL; -		const gchar* _tmp6_; -		gchar* _tmp7_; -		gchar* _tmp8_; -		GRegex* _tmp9_; -		GRegex* _tmp10_; -		gchar* _tmp11_ = NULL; -		GRegex* _tmp12_; -		const gchar* _tmp13_; -		gchar* _tmp14_; -		gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +		gchar* _tmp3_; +		gchar* _tmp4_; +		GRegex* _tmp5_; +		GRegex* _tmp6_; +		gchar* _tmp7_ = NULL; +		GRegex* _tmp8_; +		gchar* _tmp9_; +		gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3499 "GSettingsEngine.c" +#line 3496 "GSettingsEngine.c"  				goto __catch217_g_regex_error;  			} -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			return NULL; -#line 3508 "GSettingsEngine.c" +#line 3505 "GSettingsEngine.c"  		} -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			_g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3524 "GSettingsEngine.c" +#line 3519 "GSettingsEngine.c"  				goto __catch217_g_regex_error;  			} -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			_g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  			return NULL; -#line 3535 "GSettingsEngine.c" +#line 3530 "GSettingsEngine.c"  		} -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		_g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		return result; -#line 3549 "GSettingsEngine.c" +#line 3544 "GSettingsEngine.c"  	}  	goto __finally217;  	__catch217_g_regex_error:  	{  		GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		_inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		_g_error_free0 (e); -#line 3563 "GSettingsEngine.c" +#line 3558 "GSettingsEngine.c"  	}  	__finally217: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		return NULL; -#line 3574 "GSettingsEngine.c" +#line 3569 "GSettingsEngine.c"  	}  } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{  	gchar* result = NULL;  	gchar* _result_ = NULL;  	gchar* _tmp0_;  	const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	_tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	_result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	_tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	return result; -#line 3598 "GSettingsEngine.c" +#line 3595 "GSettingsEngine.c"  } -static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id) { +static gchar* +gsettings_configuration_engine_clean_plugin_id (const gchar* id) +{  	gchar* result = NULL;  	gchar* cleaned = NULL; -	const gchar* _tmp0_; -	gchar* _tmp1_; -	const gchar* _tmp2_; -	gchar* _tmp3_; -	const gchar* _tmp4_ = NULL; -	const gchar* _tmp5_; -	gboolean _tmp6_; -	gchar* _tmp8_; +	gchar* _tmp0_; +	const gchar* _tmp1_; +	gchar* _tmp2_; +	const gchar* _tmp3_ = NULL; +	const gchar* _tmp4_; +	gchar* _tmp6_;  #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (id != NULL, NULL);  #line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = id; -#line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = string_replace (_tmp0_, "/", "-"); +	_tmp0_ = string_replace (id, "/", "-");  #line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	cleaned = _tmp1_; +	cleaned = _tmp0_;  #line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = cleaned; +	_tmp1_ = cleaned;  #line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = string_strip (_tmp2_); +	_tmp2_ = string_strip (_tmp1_);  #line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (cleaned);  #line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	cleaned = _tmp3_; -#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = cleaned; +	cleaned = _tmp2_;  #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = is_string_empty (_tmp5_); +	_tmp4_ = cleaned;  #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	if (!_tmp6_) { -#line 3635 "GSettingsEngine.c" -		const gchar* _tmp7_; +	if (!is_string_empty (_tmp4_)) { +#line 3628 "GSettingsEngine.c" +		const gchar* _tmp5_;  #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = cleaned; +		_tmp5_ = cleaned;  #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = _tmp7_; -#line 3641 "GSettingsEngine.c" +		_tmp3_ = _tmp5_; +#line 3634 "GSettingsEngine.c"  	} else {  #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = NULL; -#line 3645 "GSettingsEngine.c" +		_tmp3_ = NULL; +#line 3638 "GSettingsEngine.c"  	}  #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp8_ = g_strdup (_tmp4_); +	_tmp6_ = g_strdup (_tmp3_);  #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	result = _tmp8_; +	result = _tmp6_;  #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (cleaned);  #line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3655 "GSettingsEngine.c" +#line 3648 "GSettingsEngine.c"  } -static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (const gchar* id) { +static gchar* +gsettings_configuration_engine_get_plugin_enable_disable_name (const gchar* id) +{  	gchar* result = NULL;  	gchar* cleaned_id = NULL; -	const gchar* _tmp0_; -	gchar* _tmp1_; -	const gchar* _tmp2_; -	const gchar* _tmp4_; -	gchar* _tmp5_; -	const gchar* _tmp6_; -	gchar* _tmp7_; +	gchar* _tmp0_; +	const gchar* _tmp1_; +	const gchar* _tmp3_; +	gchar* _tmp4_; +	const gchar* _tmp5_; +	gchar* _tmp6_;  #line 284 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (id != NULL, NULL);  #line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = id; -#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = gsettings_configuration_engine_clean_plugin_id (_tmp0_); +	_tmp0_ = gsettings_configuration_engine_clean_plugin_id (id);  #line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	cleaned_id = _tmp1_; +	cleaned_id = _tmp0_;  #line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = cleaned_id; +	_tmp1_ = cleaned_id;  #line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	if (_tmp2_ == NULL) { -#line 3681 "GSettingsEngine.c" -		gchar* _tmp3_; +	if (_tmp1_ == NULL) { +#line 3673 "GSettingsEngine.c" +		gchar* _tmp2_;  #line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = g_strdup ("default"); +		_tmp2_ = g_strdup ("default");  #line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (cleaned_id);  #line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		cleaned_id = _tmp3_; -#line 3689 "GSettingsEngine.c" +		cleaned_id = _tmp2_; +#line 3681 "GSettingsEngine.c"  	}  #line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = cleaned_id; +	_tmp3_ = cleaned_id;  #line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = string_replace (_tmp4_, "org.yorba.shotwell.", ""); +	_tmp4_ = string_replace (_tmp3_, "org.yorba.shotwell.", "");  #line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (cleaned_id);  #line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	cleaned_id = _tmp5_; +	cleaned_id = _tmp4_;  #line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = cleaned_id; +	_tmp5_ = cleaned_id;  #line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = string_replace (_tmp6_, ".", "-"); +	_tmp6_ = string_replace (_tmp5_, ".", "-");  #line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (cleaned_id);  #line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	cleaned_id = _tmp7_; +	cleaned_id = _tmp6_;  #line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	result = cleaned_id;  #line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3711 "GSettingsEngine.c" +#line 3703 "GSettingsEngine.c"  } -static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, const gchar* id) { +static gchar* +gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, +                                                        const gchar* id) +{  	gchar* result = NULL;  	gchar* cleaned_id = NULL; -	const gchar* _tmp0_; -	gchar* _tmp1_; -	const gchar* _tmp2_; -	const gchar* _tmp4_; -	gchar* _tmp5_; -	const gchar* _tmp6_; -	const gchar* _tmp7_; -	gchar* _tmp8_; +	gchar* _tmp0_; +	const gchar* _tmp1_; +	const gchar* _tmp3_; +	gchar* _tmp4_; +	const gchar* _tmp5_; +	gchar* _tmp6_;  #line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (domain != NULL, NULL);  #line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (id != NULL, NULL);  #line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = id; +	_tmp0_ = gsettings_configuration_engine_clean_plugin_id (id);  #line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = gsettings_configuration_engine_clean_plugin_id (_tmp0_); -#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	cleaned_id = _tmp1_; +	cleaned_id = _tmp0_;  #line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = cleaned_id; +	_tmp1_ = cleaned_id;  #line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	if (_tmp2_ == NULL) { -#line 3740 "GSettingsEngine.c" -		gchar* _tmp3_; +	if (_tmp1_ == NULL) { +#line 3731 "GSettingsEngine.c" +		gchar* _tmp2_;  #line 298 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = g_strdup ("default"); +		_tmp2_ = g_strdup ("default");  #line 298 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (cleaned_id);  #line 298 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		cleaned_id = _tmp3_; -#line 3748 "GSettingsEngine.c" +		cleaned_id = _tmp2_; +#line 3739 "GSettingsEngine.c"  	}  #line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = cleaned_id; +	_tmp3_ = cleaned_id;  #line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = string_replace (_tmp4_, ".", "-"); +	_tmp4_ = string_replace (_tmp3_, ".", "-");  #line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (cleaned_id);  #line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	cleaned_id = _tmp5_; -#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = domain; +	cleaned_id = _tmp4_;  #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = cleaned_id; +	_tmp5_ = cleaned_id;  #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp8_ = g_strdup_printf ("org.yorba.shotwell.%s.%s", _tmp6_, _tmp7_); +	_tmp6_ = g_strdup_printf ("org.yorba.shotwell.%s.%s", domain, _tmp5_);  #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	result = _tmp8_; +	result = _tmp6_;  #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (cleaned_id);  #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3770 "GSettingsEngine.c" +#line 3759 "GSettingsEngine.c"  } -static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gconf_key) { +static gchar* +gsettings_configuration_engine_make_gsettings_key (const gchar* gconf_key) +{  	gchar* result = NULL; -	const gchar* _tmp0_; -	gchar* _tmp1_; +	gchar* _tmp0_;  #line 304 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (gconf_key != NULL, NULL);  #line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = gconf_key; -#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = string_replace (_tmp0_, "_", "-"); +	_tmp0_ = string_replace (gconf_key, "_", "-");  #line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	result = _tmp1_; +	result = _tmp0_;  #line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3788 "GSettingsEngine.c" +#line 3776 "GSettingsEngine.c"  } -static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine* base) { +static gchar* +gsettings_configuration_engine_real_get_name (ConfigurationEngine* base) +{  	GSettingsConfigurationEngine * self;  	gchar* result = NULL;  	gchar* _tmp0_; @@ -3800,23 +3790,24 @@ static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine*  	result = _tmp0_;  #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3804 "GSettingsEngine.c" +#line 3794 "GSettingsEngine.c"  } -static gint gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gint +gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, +                                                       ConfigurableProperty p, +                                                       GError** error) +{  	GSettingsConfigurationEngine * self;  	gint result = 0;  	gint _tmp0_ = 0;  	gchar** _tmp1_;  	gint _tmp1__length1; -	ConfigurableProperty _tmp2_; -	const gchar* _tmp3_; -	gchar** _tmp4_; -	gint _tmp4__length1; -	ConfigurableProperty _tmp5_; -	const gchar* _tmp6_; -	gint _tmp7_; +	const gchar* _tmp2_; +	gchar** _tmp3_; +	gint _tmp3__length1; +	const gchar* _tmp4_;  	GError * _inner_error_ = NULL;  #line 312 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -3825,63 +3816,58 @@ static gint gsettings_configuration_engine_real_get_enum_property (Configuration  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp1__length1 = self->priv->schema_names_length1;  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = p; -#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = _tmp1_[_tmp2_]; -#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = self->priv->key_names; +	_tmp2_ = _tmp1_[p];  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4__length1 = self->priv->key_names_length1; -#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = p; +	_tmp3_ = self->priv->key_names;  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = _tmp4_[_tmp5_]; +	_tmp3__length1 = self->priv->key_names_length1;  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = gsettings_configuration_engine_get_gs_enum (self, _tmp3_, _tmp6_, &_inner_error_); +	_tmp4_ = _tmp3_[p];  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = _tmp7_; +	_tmp0_ = gsettings_configuration_engine_get_gs_enum (self, _tmp2_, _tmp4_, &_inner_error_);  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3848 "GSettingsEngine.c" -			gint _tmp8_ = 0; +#line 3833 "GSettingsEngine.c" +			gint _tmp5_ = 0;  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_propagate_error (error, _inner_error_);  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp8_; -#line 3854 "GSettingsEngine.c" +			return _tmp5_; +#line 3839 "GSettingsEngine.c"  		} else { -			gint _tmp9_ = 0; +			gint _tmp6_ = 0;  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp9_; -#line 3863 "GSettingsEngine.c" +			return _tmp6_; +#line 3848 "GSettingsEngine.c"  		}  	}  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	result = _tmp0_;  #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3870 "GSettingsEngine.c" +#line 3855 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error) { +static void +gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, +                                                       ConfigurableProperty p, +                                                       gint val, +                                                       GError** error) +{  	GSettingsConfigurationEngine * self;  	gchar** _tmp0_;  	gint _tmp0__length1; -	ConfigurableProperty _tmp1_; -	const gchar* _tmp2_; -	gchar** _tmp3_; -	gint _tmp3__length1; -	ConfigurableProperty _tmp4_; -	const gchar* _tmp5_; -	gint _tmp6_; -	ConfigurableProperty _tmp7_; +	const gchar* _tmp1_; +	gchar** _tmp2_; +	gint _tmp2__length1; +	const gchar* _tmp3_;  	GError * _inner_error_ = NULL;  #line 316 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -3890,21 +3876,15 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp0__length1 = self->priv->schema_names_length1;  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = p; +	_tmp1_ = _tmp0_[p];  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = _tmp0_[_tmp1_]; +	_tmp2_ = self->priv->key_names;  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = self->priv->key_names; +	_tmp2__length1 = self->priv->key_names_length1;  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3__length1 = self->priv->key_names_length1; +	_tmp3_ = _tmp2_[p];  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = p; -#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = _tmp3_[_tmp4_]; -#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = val; -#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_set_gs_enum (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_); +	gsettings_configuration_engine_set_gs_enum (self, _tmp1_, _tmp3_, val, &_inner_error_);  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3913,7 +3893,7 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration  			g_propagate_error (error, _inner_error_);  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3917 "GSettingsEngine.c" +#line 3897 "GSettingsEngine.c"  		} else {  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3921,30 +3901,29 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration  			g_clear_error (&_inner_error_);  #line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 3925 "GSettingsEngine.c" +#line 3905 "GSettingsEngine.c"  		}  	}  #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = p; -#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_); -#line 3932 "GSettingsEngine.c" +	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p); +#line 3910 "GSettingsEngine.c"  } -static gint gsettings_configuration_engine_real_get_int_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gint +gsettings_configuration_engine_real_get_int_property (ConfigurationEngine* base, +                                                      ConfigurableProperty p, +                                                      GError** error) +{  	GSettingsConfigurationEngine * self;  	gint result = 0;  	gint _tmp0_ = 0;  	gchar** _tmp1_;  	gint _tmp1__length1; -	ConfigurableProperty _tmp2_; -	const gchar* _tmp3_; -	gchar** _tmp4_; -	gint _tmp4__length1; -	ConfigurableProperty _tmp5_; -	const gchar* _tmp6_; -	gint _tmp7_; +	const gchar* _tmp2_; +	gchar** _tmp3_; +	gint _tmp3__length1; +	const gchar* _tmp4_;  	GError * _inner_error_ = NULL;  #line 321 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -3953,63 +3932,58 @@ static gint gsettings_configuration_engine_real_get_int_property (ConfigurationE  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp1__length1 = self->priv->schema_names_length1;  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = p; -#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = _tmp1_[_tmp2_]; +	_tmp2_ = _tmp1_[p];  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = self->priv->key_names; -#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4__length1 = self->priv->key_names_length1; -#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = p; +	_tmp3_ = self->priv->key_names;  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = _tmp4_[_tmp5_]; +	_tmp3__length1 = self->priv->key_names_length1;  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = gsettings_configuration_engine_get_gs_int (self, _tmp3_, _tmp6_, &_inner_error_); +	_tmp4_ = _tmp3_[p];  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = _tmp7_; +	_tmp0_ = gsettings_configuration_engine_get_gs_int (self, _tmp2_, _tmp4_, &_inner_error_);  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3976 "GSettingsEngine.c" -			gint _tmp8_ = 0; +#line 3949 "GSettingsEngine.c" +			gint _tmp5_ = 0;  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_propagate_error (error, _inner_error_);  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp8_; -#line 3982 "GSettingsEngine.c" +			return _tmp5_; +#line 3955 "GSettingsEngine.c"  		} else { -			gint _tmp9_ = 0; +			gint _tmp6_ = 0;  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp9_; -#line 3991 "GSettingsEngine.c" +			return _tmp6_; +#line 3964 "GSettingsEngine.c"  		}  	}  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	result = _tmp0_;  #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 3998 "GSettingsEngine.c" +#line 3971 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error) { +static void +gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, +                                                      ConfigurableProperty p, +                                                      gint val, +                                                      GError** error) +{  	GSettingsConfigurationEngine * self;  	gchar** _tmp0_;  	gint _tmp0__length1; -	ConfigurableProperty _tmp1_; -	const gchar* _tmp2_; -	gchar** _tmp3_; -	gint _tmp3__length1; -	ConfigurableProperty _tmp4_; -	const gchar* _tmp5_; -	gint _tmp6_; -	ConfigurableProperty _tmp7_; +	const gchar* _tmp1_; +	gchar** _tmp2_; +	gint _tmp2__length1; +	const gchar* _tmp3_;  	GError * _inner_error_ = NULL;  #line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4018,21 +3992,15 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp0__length1 = self->priv->schema_names_length1;  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = p; -#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = _tmp0_[_tmp1_]; -#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = self->priv->key_names; -#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3__length1 = self->priv->key_names_length1; +	_tmp1_ = _tmp0_[p];  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = p; +	_tmp2_ = self->priv->key_names;  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = _tmp3_[_tmp4_]; +	_tmp2__length1 = self->priv->key_names_length1;  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = val; +	_tmp3_ = _tmp2_[p];  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_set_gs_int (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_); +	gsettings_configuration_engine_set_gs_int (self, _tmp1_, _tmp3_, val, &_inner_error_);  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4041,7 +4009,7 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE  			g_propagate_error (error, _inner_error_);  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 4045 "GSettingsEngine.c" +#line 4013 "GSettingsEngine.c"  		} else {  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4049,201 +4017,147 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE  			g_clear_error (&_inner_error_);  #line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 4053 "GSettingsEngine.c" +#line 4021 "GSettingsEngine.c"  		}  	}  #line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = p; -#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_); -#line 4060 "GSettingsEngine.c" +	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p); +#line 4026 "GSettingsEngine.c"  } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, +                glong maxlen) +{  	glong result = 0L;  	gchar* end = NULL;  	gchar* _tmp0_; -	glong _tmp1_; -	gchar* _tmp2_; -	gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	if (_tmp3_ == NULL) { -#line 4083 "GSettingsEngine.c" -		glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +	gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	_tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	_tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		return result; -#line 4091 "GSettingsEngine.c" +#line 4050 "GSettingsEngine.c"  	} else { -		gchar* _tmp5_; -		gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +		gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		return result; -#line 4103 "GSettingsEngine.c" +#line 4059 "GSettingsEngine.c"  	}  } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, +                  glong offset, +                  glong len) +{  	gchar* result = NULL;  	glong string_length = 0L;  	gboolean _tmp0_ = FALSE; -	glong _tmp1_; -	glong _tmp8_; -	glong _tmp14_; -	glong _tmp17_; -	glong _tmp18_; -	glong _tmp19_; -	glong _tmp20_; -	glong _tmp21_; -	gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +	glong _tmp6_; +	gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	if (_tmp1_ >= ((glong) 0)) { -#line 4127 "GSettingsEngine.c" -		glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp0_ = _tmp2_ >= ((glong) 0); -#line 4133 "GSettingsEngine.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp0_ = len >= ((glong) 0); +#line 4080 "GSettingsEngine.c"  	} else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  		_tmp0_ = FALSE; -#line 4137 "GSettingsEngine.c" +#line 4084 "GSettingsEngine.c"  	} -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	if (_tmp0_) { -#line 4141 "GSettingsEngine.c" -		glong _tmp3_; -		glong _tmp4_; -		glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		string_length = _tmp5_; -#line 4153 "GSettingsEngine.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		string_length = string_strnlen ((gchar*) self, offset + len); +#line 4090 "GSettingsEngine.c"  	} else { -		gint _tmp6_; -		gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		string_length = (glong) _tmp7_; -#line 4163 "GSettingsEngine.c" +		gint _tmp1_; +		gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		string_length = (glong) _tmp2_; +#line 4100 "GSettingsEngine.c"  	} -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	if (_tmp8_ < ((glong) 0)) { -#line 4169 "GSettingsEngine.c" -		glong _tmp9_; -		glong _tmp10_; -		glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 4183 "GSettingsEngine.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	if (offset < ((glong) 0)) { +#line 4104 "GSettingsEngine.c" +		glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 4112 "GSettingsEngine.c"  	} else { -		glong _tmp12_; -		glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 4193 "GSettingsEngine.c" +		glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 4119 "GSettingsEngine.c"  	} -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	if (_tmp14_ < ((glong) 0)) { -#line 4199 "GSettingsEngine.c" -		glong _tmp15_; -		glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		_tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -		len = _tmp15_ - _tmp16_; -#line 4208 "GSettingsEngine.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	if (len < ((glong) 0)) { +#line 4123 "GSettingsEngine.c" +		glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		_tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +		len = _tmp5_ - offset; +#line 4129 "GSettingsEngine.c"  	} -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" -	result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	_tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	_tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" +	result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"  	return result; -#line 4228 "GSettingsEngine.c" +#line 4141 "GSettingsEngine.c"  } -static gchar* gsettings_configuration_engine_real_get_string_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gchar* +gsettings_configuration_engine_real_get_string_property (ConfigurationEngine* base, +                                                         ConfigurableProperty p, +                                                         GError** error) +{  	GSettingsConfigurationEngine * self;  	gchar* result = NULL;  	gchar* gs_result = NULL;  	gchar** _tmp0_;  	gint _tmp0__length1; -	ConfigurableProperty _tmp1_; -	const gchar* _tmp2_; -	gchar** _tmp3_; -	gint _tmp3__length1; -	ConfigurableProperty _tmp4_; -	const gchar* _tmp5_; -	gchar* _tmp6_; +	const gchar* _tmp1_; +	gchar** _tmp2_; +	gint _tmp2__length1; +	const gchar* _tmp3_; +	gchar* _tmp4_;  	gchar* _result_ = NULL; -	gchar* _tmp7_; -	ConfigurableProperty _tmp8_; +	gchar* _tmp5_;  	GError * _inner_error_ = NULL;  #line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4252,21 +4166,17 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp0__length1 = self->priv->schema_names_length1;  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = p; -#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = _tmp0_[_tmp1_]; +	_tmp1_ = _tmp0_[p];  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = self->priv->key_names; +	_tmp2_ = self->priv->key_names;  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3__length1 = self->priv->key_names_length1; +	_tmp2__length1 = self->priv->key_names_length1;  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = p; +	_tmp3_ = _tmp2_[p];  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = _tmp3_[_tmp4_]; +	_tmp4_ = gsettings_configuration_engine_get_gs_string (self, _tmp1_, _tmp3_, &_inner_error_);  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = gsettings_configuration_engine_get_gs_string (self, _tmp2_, _tmp5_, &_inner_error_); -#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gs_result = _tmp6_; +	gs_result = _tmp4_;  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4275,7 +4185,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura  			g_propagate_error (error, _inner_error_);  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return NULL; -#line 4279 "GSettingsEngine.c" +#line 4189 "GSettingsEngine.c"  		} else {  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4283,26 +4193,24 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura  			g_clear_error (&_inner_error_);  #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return NULL; -#line 4287 "GSettingsEngine.c" +#line 4197 "GSettingsEngine.c"  		}  	}  #line 335 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = g_strdup (gs_result); +	_tmp5_ = g_strdup (gs_result);  #line 335 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_result_ = _tmp7_; -#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp8_ = p; +	_result_ = _tmp5_;  #line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	if (_tmp8_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) { -#line 4298 "GSettingsEngine.c" -		gchar* _tmp9_; +	if (p == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) { +#line 4206 "GSettingsEngine.c" +		gchar* _tmp6_;  #line 337 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp9_ = string_substring (gs_result, (glong) 7, (glong) -1); +		_tmp6_ = string_substring (gs_result, (glong) 7, (glong) -1);  #line 337 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (_result_);  #line 337 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_result_ = _tmp9_; -#line 4306 "GSettingsEngine.c" +		_result_ = _tmp6_; +#line 4214 "GSettingsEngine.c"  	}  #line 340 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	result = _result_; @@ -4310,88 +4218,74 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura  	_g_free0 (gs_result);  #line 340 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 4314 "GSettingsEngine.c" +#line 4222 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_string_property (ConfigurationEngine* base, ConfigurableProperty p, const gchar* val, GError** error) { +static void +gsettings_configuration_engine_real_set_string_property (ConfigurationEngine* base, +                                                         ConfigurableProperty p, +                                                         const gchar* val, +                                                         GError** error) +{  	GSettingsConfigurationEngine * self;  	gchar* converted_val = NULL; -	const gchar* _tmp0_; -	gchar* _tmp1_; -	gboolean _tmp2_ = FALSE; -	ConfigurableProperty _tmp3_; -	gchar** _tmp7_; -	gint _tmp7__length1; -	ConfigurableProperty _tmp8_; -	const gchar* _tmp9_; -	gchar** _tmp10_; -	gint _tmp10__length1; -	ConfigurableProperty _tmp11_; -	const gchar* _tmp12_; -	const gchar* _tmp13_; -	ConfigurableProperty _tmp14_; +	gchar* _tmp0_; +	gboolean _tmp1_ = FALSE; +	gchar** _tmp3_; +	gint _tmp3__length1; +	const gchar* _tmp4_; +	gchar** _tmp5_; +	gint _tmp5__length1; +	const gchar* _tmp6_; +	const gchar* _tmp7_;  	GError * _inner_error_ = NULL;  #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);  #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (val != NULL);  #line 345 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = val; -#line 345 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = g_strdup (_tmp0_); +	_tmp0_ = g_strdup (val);  #line 345 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	converted_val = _tmp1_; +	converted_val = _tmp0_;  #line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = p; +	if (p == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) {  #line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	if (_tmp3_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) { -#line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp2_ = TRUE; -#line 4352 "GSettingsEngine.c" +		_tmp1_ = TRUE; +#line 4256 "GSettingsEngine.c"  	} else { -		ConfigurableProperty _tmp4_; -#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = p;  #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp2_ = _tmp4_ == CONFIGURABLE_PROPERTY_SCREENSAVER_FILE; -#line 4359 "GSettingsEngine.c" +		_tmp1_ = p == CONFIGURABLE_PROPERTY_SCREENSAVER_FILE; +#line 4260 "GSettingsEngine.c"  	}  #line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	if (_tmp2_) { -#line 4363 "GSettingsEngine.c" -		const gchar* _tmp5_; -		gchar* _tmp6_; -#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = val; +	if (_tmp1_) { +#line 4264 "GSettingsEngine.c" +		gchar* _tmp2_;  #line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = g_strconcat ("file://", _tmp5_, NULL); +		_tmp2_ = g_strconcat ("file://", val, NULL);  #line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (converted_val);  #line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		converted_val = _tmp6_; -#line 4374 "GSettingsEngine.c" +		converted_val = _tmp2_; +#line 4272 "GSettingsEngine.c"  	}  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = self->priv->schema_names; -#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7__length1 = self->priv->schema_names_length1; -#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp8_ = p; +	_tmp3_ = self->priv->schema_names;  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp9_ = _tmp7_[_tmp8_]; +	_tmp3__length1 = self->priv->schema_names_length1;  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp10_ = self->priv->key_names; +	_tmp4_ = _tmp3_[p];  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp10__length1 = self->priv->key_names_length1; +	_tmp5_ = self->priv->key_names;  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp11_ = p; +	_tmp5__length1 = self->priv->key_names_length1;  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp12_ = _tmp10_[_tmp11_]; +	_tmp6_ = _tmp5_[p];  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp13_ = converted_val; +	_tmp7_ = converted_val;  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_set_gs_string (self, _tmp9_, _tmp12_, _tmp13_, &_inner_error_); +	gsettings_configuration_engine_set_gs_string (self, _tmp4_, _tmp6_, _tmp7_, &_inner_error_);  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4402,7 +4296,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati  			_g_free0 (converted_val);  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 4406 "GSettingsEngine.c" +#line 4300 "GSettingsEngine.c"  		} else {  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			_g_free0 (converted_val); @@ -4412,32 +4306,31 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati  			g_clear_error (&_inner_error_);  #line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 4416 "GSettingsEngine.c" +#line 4310 "GSettingsEngine.c"  		}  	}  #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp14_ = p; -#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp14_); +	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p);  #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (converted_val); -#line 4425 "GSettingsEngine.c" +#line 4317 "GSettingsEngine.c"  } -static gboolean gsettings_configuration_engine_real_get_bool_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gboolean +gsettings_configuration_engine_real_get_bool_property (ConfigurationEngine* base, +                                                       ConfigurableProperty p, +                                                       GError** error) +{  	GSettingsConfigurationEngine * self;  	gboolean result = FALSE;  	gboolean _tmp0_ = FALSE;  	gchar** _tmp1_;  	gint _tmp1__length1; -	ConfigurableProperty _tmp2_; -	const gchar* _tmp3_; -	gchar** _tmp4_; -	gint _tmp4__length1; -	ConfigurableProperty _tmp5_; -	const gchar* _tmp6_; -	gboolean _tmp7_; +	const gchar* _tmp2_; +	gchar** _tmp3_; +	gint _tmp3__length1; +	const gchar* _tmp4_;  	GError * _inner_error_ = NULL;  #line 355 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4446,63 +4339,58 @@ static gboolean gsettings_configuration_engine_real_get_bool_property (Configura  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp1__length1 = self->priv->schema_names_length1;  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = p; -#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = _tmp1_[_tmp2_]; -#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = self->priv->key_names; -#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4__length1 = self->priv->key_names_length1; +	_tmp2_ = _tmp1_[p];  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = p; +	_tmp3_ = self->priv->key_names;  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = _tmp4_[_tmp5_]; +	_tmp3__length1 = self->priv->key_names_length1;  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = gsettings_configuration_engine_get_gs_bool (self, _tmp3_, _tmp6_, &_inner_error_); +	_tmp4_ = _tmp3_[p];  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = _tmp7_; +	_tmp0_ = gsettings_configuration_engine_get_gs_bool (self, _tmp2_, _tmp4_, &_inner_error_);  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4469 "GSettingsEngine.c" -			gboolean _tmp8_ = FALSE; +#line 4356 "GSettingsEngine.c" +			gboolean _tmp5_ = FALSE;  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_propagate_error (error, _inner_error_);  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp8_; -#line 4475 "GSettingsEngine.c" +			return _tmp5_; +#line 4362 "GSettingsEngine.c"  		} else { -			gboolean _tmp9_ = FALSE; +			gboolean _tmp6_ = FALSE;  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp9_; -#line 4484 "GSettingsEngine.c" +			return _tmp6_; +#line 4371 "GSettingsEngine.c"  		}  	}  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	result = _tmp0_;  #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 4491 "GSettingsEngine.c" +#line 4378 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_bool_property (ConfigurationEngine* base, ConfigurableProperty p, gboolean val, GError** error) { +static void +gsettings_configuration_engine_real_set_bool_property (ConfigurationEngine* base, +                                                       ConfigurableProperty p, +                                                       gboolean val, +                                                       GError** error) +{  	GSettingsConfigurationEngine * self;  	gchar** _tmp0_;  	gint _tmp0__length1; -	ConfigurableProperty _tmp1_; -	const gchar* _tmp2_; -	gchar** _tmp3_; -	gint _tmp3__length1; -	ConfigurableProperty _tmp4_; -	const gchar* _tmp5_; -	gboolean _tmp6_; -	ConfigurableProperty _tmp7_; +	const gchar* _tmp1_; +	gchar** _tmp2_; +	gint _tmp2__length1; +	const gchar* _tmp3_;  	GError * _inner_error_ = NULL;  #line 359 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4511,21 +4399,15 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp0__length1 = self->priv->schema_names_length1;  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = p; -#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = _tmp0_[_tmp1_]; -#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = self->priv->key_names; -#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3__length1 = self->priv->key_names_length1; +	_tmp1_ = _tmp0_[p];  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = p; +	_tmp2_ = self->priv->key_names;  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = _tmp3_[_tmp4_]; +	_tmp2__length1 = self->priv->key_names_length1;  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = val; +	_tmp3_ = _tmp2_[p];  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_set_gs_bool (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_); +	gsettings_configuration_engine_set_gs_bool (self, _tmp1_, _tmp3_, val, &_inner_error_);  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4534,7 +4416,7 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration  			g_propagate_error (error, _inner_error_);  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 4538 "GSettingsEngine.c" +#line 4420 "GSettingsEngine.c"  		} else {  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4542,30 +4424,29 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration  			g_clear_error (&_inner_error_);  #line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 4546 "GSettingsEngine.c" +#line 4428 "GSettingsEngine.c"  		}  	}  #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = p; -#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_); -#line 4553 "GSettingsEngine.c" +	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p); +#line 4433 "GSettingsEngine.c"  } -static gdouble gsettings_configuration_engine_real_get_double_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) { +static gdouble +gsettings_configuration_engine_real_get_double_property (ConfigurationEngine* base, +                                                         ConfigurableProperty p, +                                                         GError** error) +{  	GSettingsConfigurationEngine * self;  	gdouble result = 0.0;  	gdouble _tmp0_ = 0.0;  	gchar** _tmp1_;  	gint _tmp1__length1; -	ConfigurableProperty _tmp2_; -	const gchar* _tmp3_; -	gchar** _tmp4_; -	gint _tmp4__length1; -	ConfigurableProperty _tmp5_; -	const gchar* _tmp6_; -	gdouble _tmp7_; +	const gchar* _tmp2_; +	gchar** _tmp3_; +	gint _tmp3__length1; +	const gchar* _tmp4_;  	GError * _inner_error_ = NULL;  #line 364 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4574,63 +4455,58 @@ static gdouble gsettings_configuration_engine_real_get_double_property (Configur  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp1__length1 = self->priv->schema_names_length1;  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = p; +	_tmp2_ = _tmp1_[p];  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = _tmp1_[_tmp2_]; -#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = self->priv->key_names; -#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4__length1 = self->priv->key_names_length1; -#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = p; +	_tmp3_ = self->priv->key_names;  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = _tmp4_[_tmp5_]; +	_tmp3__length1 = self->priv->key_names_length1;  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = gsettings_configuration_engine_get_gs_double (self, _tmp3_, _tmp6_, &_inner_error_); +	_tmp4_ = _tmp3_[p];  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = _tmp7_; +	_tmp0_ = gsettings_configuration_engine_get_gs_double (self, _tmp2_, _tmp4_, &_inner_error_);  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4597 "GSettingsEngine.c" -			gdouble _tmp8_ = 0.0; +#line 4472 "GSettingsEngine.c" +			gdouble _tmp5_ = 0.0;  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_propagate_error (error, _inner_error_);  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp8_; -#line 4603 "GSettingsEngine.c" +			return _tmp5_; +#line 4478 "GSettingsEngine.c"  		} else { -			gdouble _tmp9_ = 0.0; +			gdouble _tmp6_ = 0.0;  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp9_; -#line 4612 "GSettingsEngine.c" +			return _tmp6_; +#line 4487 "GSettingsEngine.c"  		}  	}  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	result = _tmp0_;  #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return result; -#line 4619 "GSettingsEngine.c" +#line 4494 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_double_property (ConfigurationEngine* base, ConfigurableProperty p, gdouble val, GError** error) { +static void +gsettings_configuration_engine_real_set_double_property (ConfigurationEngine* base, +                                                         ConfigurableProperty p, +                                                         gdouble val, +                                                         GError** error) +{  	GSettingsConfigurationEngine * self;  	gchar** _tmp0_;  	gint _tmp0__length1; -	ConfigurableProperty _tmp1_; -	const gchar* _tmp2_; -	gchar** _tmp3_; -	gint _tmp3__length1; -	ConfigurableProperty _tmp4_; -	const gchar* _tmp5_; -	gdouble _tmp6_; -	ConfigurableProperty _tmp7_; +	const gchar* _tmp1_; +	gchar** _tmp2_; +	gint _tmp2__length1; +	const gchar* _tmp3_;  	GError * _inner_error_ = NULL;  #line 368 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4639,21 +4515,15 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_tmp0__length1 = self->priv->schema_names_length1;  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = p; -#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = _tmp0_[_tmp1_]; -#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3_ = self->priv->key_names; -#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp3__length1 = self->priv->key_names_length1; +	_tmp1_ = _tmp0_[p];  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp4_ = p; +	_tmp2_ = self->priv->key_names;  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp5_ = _tmp3_[_tmp4_]; +	_tmp2__length1 = self->priv->key_names_length1;  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp6_ = val; +	_tmp3_ = _tmp2_[p];  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	gsettings_configuration_engine_set_gs_double (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_); +	gsettings_configuration_engine_set_gs_double (self, _tmp1_, _tmp3_, val, &_inner_error_);  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4662,7 +4532,7 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati  			g_propagate_error (error, _inner_error_);  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 4666 "GSettingsEngine.c" +#line 4536 "GSettingsEngine.c"  		} else {  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4670,25 +4540,27 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati  			g_clear_error (&_inner_error_);  #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 4674 "GSettingsEngine.c" +#line 4544 "GSettingsEngine.c"  		}  	}  #line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp7_ = p; -#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_); -#line 4681 "GSettingsEngine.c" +	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", p); +#line 4549 "GSettingsEngine.c"  } -static gboolean gsettings_configuration_engine_real_get_plugin_bool (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gboolean def) { +static gboolean +gsettings_configuration_engine_real_get_plugin_bool (ConfigurationEngine* base, +                                                     const gchar* domain, +                                                     const gchar* id, +                                                     const gchar* key, +                                                     gboolean def) +{  	GSettingsConfigurationEngine * self;  	gboolean result = FALSE;  	gchar* schema_name = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_; -	gchar* _tmp2_; -	gboolean _tmp13_ = FALSE; +	gchar* _tmp0_; +	gboolean _tmp8_ = FALSE;  	GError * _inner_error_ = NULL;  #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4699,42 +4571,32 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati  #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (key != NULL, FALSE);  #line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = domain; -#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = id; +	_tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id);  #line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_name = _tmp2_; -#line 4710 "GSettingsEngine.c" +	schema_name = _tmp0_; +#line 4578 "GSettingsEngine.c"  	{ -		gboolean _tmp3_ = FALSE; -		const gchar* _tmp4_; -		gchar* _tmp5_; -		gchar* _tmp6_; -		gboolean _tmp7_; -		gboolean _tmp8_; -#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = key; +		gboolean _tmp1_ = FALSE; +		gchar* _tmp2_; +		gchar* _tmp3_; +		gboolean _tmp4_;  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_); +		_tmp2_ = gsettings_configuration_engine_make_gsettings_key (key);  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = _tmp5_; +		_tmp3_ = _tmp2_;  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = gsettings_configuration_engine_get_gs_bool (self, schema_name, _tmp6_, &_inner_error_); +		_tmp4_ = gsettings_configuration_engine_get_gs_bool (self, schema_name, _tmp3_, &_inner_error_);  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp8_ = _tmp7_; -#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp6_); +		_g_free0 (_tmp3_);  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = _tmp8_; +		_tmp1_ = _tmp4_;  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4734 "GSettingsEngine.c" -			gboolean _tmp9_ = FALSE; +#line 4596 "GSettingsEngine.c" +			gboolean _tmp5_ = FALSE;  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4738 "GSettingsEngine.c" +#line 4600 "GSettingsEngine.c"  				goto __catch218_configuration_error;  			}  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4744,45 +4606,42 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp9_; -#line 4749 "GSettingsEngine.c" +			return _tmp5_; +#line 4611 "GSettingsEngine.c"  		}  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		result = _tmp3_; +		result = _tmp1_;  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (schema_name);  #line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 4757 "GSettingsEngine.c" +#line 4619 "GSettingsEngine.c"  	}  	goto __finally218;  	__catch218_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp10_; -		const gchar* _tmp11_; -		gboolean _tmp12_; +		GError* _tmp6_; +		const gchar* _tmp7_;  #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp10_ = err; +		_tmp6_ = err;  #line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp11_ = _tmp10_->message; +		_tmp7_ = _tmp6_->message;  #line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:379: GSettingsConfigurationEngine: error: %s", _tmp11_); +		g_critical ("GSettingsEngine.vala:379: GSettingsConfigurationEngine: error: %s", _tmp7_);  #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp12_ = def; -#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		result = _tmp12_; +		result = def;  #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err);  #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (schema_name);  #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 4786 "GSettingsEngine.c" +#line 4645 "GSettingsEngine.c"  	}  	__finally218:  #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4792,17 +4651,21 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati  #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_clear_error (&_inner_error_);  #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	return _tmp13_; -#line 4797 "GSettingsEngine.c" +	return _tmp8_; +#line 4656 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gboolean val) { +static void +gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEngine* base, +                                                     const gchar* domain, +                                                     const gchar* id, +                                                     const gchar* key, +                                                     gboolean val) +{  	GSettingsConfigurationEngine * self;  	gchar* schema_name = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_; -	gchar* _tmp2_; +	gchar* _tmp0_;  	GError * _inner_error_ = NULL;  #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4813,36 +4676,26 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn  #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = domain; +	_tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id);  #line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = id; -#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_name = _tmp2_; -#line 4824 "GSettingsEngine.c" +	schema_name = _tmp0_; +#line 4683 "GSettingsEngine.c"  	{ -		const gchar* _tmp3_; -		gchar* _tmp4_; -		gchar* _tmp5_; -		gboolean _tmp6_; +		gchar* _tmp1_; +		gchar* _tmp2_;  #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = key; +		_tmp1_ = gsettings_configuration_engine_make_gsettings_key (key);  #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); +		_tmp2_ = _tmp1_;  #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = _tmp4_; -#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = val; +		gsettings_configuration_engine_set_gs_bool (self, schema_name, _tmp2_, val, &_inner_error_);  #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		gsettings_configuration_engine_set_gs_bool (self, schema_name, _tmp5_, _tmp6_, &_inner_error_); -#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp5_); +		_g_free0 (_tmp2_);  #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4846 "GSettingsEngine.c" +#line 4699 "GSettingsEngine.c"  				goto __catch219_configuration_error;  			}  #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4853,28 +4706,28 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn  			g_clear_error (&_inner_error_);  #line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 4857 "GSettingsEngine.c" +#line 4710 "GSettingsEngine.c"  		}  	}  	goto __finally219;  	__catch219_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp7_; -		const gchar* _tmp8_; +		GError* _tmp3_; +		const gchar* _tmp4_;  #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = err; +		_tmp3_ = err;  #line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp8_ = _tmp7_->message; +		_tmp4_ = _tmp3_->message;  #line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:390: GSettingsConfigurationEngine: error: %s", _tmp8_); +		g_critical ("GSettingsEngine.vala:390: GSettingsConfigurationEngine: error: %s", _tmp4_);  #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err); -#line 4878 "GSettingsEngine.c" +#line 4731 "GSettingsEngine.c"  	}  	__finally219:  #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4887,22 +4740,26 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn  		g_clear_error (&_inner_error_);  #line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return; -#line 4891 "GSettingsEngine.c" +#line 4744 "GSettingsEngine.c"  	}  #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (schema_name); -#line 4895 "GSettingsEngine.c" +#line 4748 "GSettingsEngine.c"  } -static gdouble gsettings_configuration_engine_real_get_plugin_double (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gdouble def) { +static gdouble +gsettings_configuration_engine_real_get_plugin_double (ConfigurationEngine* base, +                                                       const gchar* domain, +                                                       const gchar* id, +                                                       const gchar* key, +                                                       gdouble def) +{  	GSettingsConfigurationEngine * self;  	gdouble result = 0.0;  	gchar* schema_name = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_; -	gchar* _tmp2_; -	gdouble _tmp13_ = 0.0; +	gchar* _tmp0_; +	gdouble _tmp8_ = 0.0;  	GError * _inner_error_ = NULL;  #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4913,42 +4770,32 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat  #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (key != NULL, 0.0);  #line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = domain; -#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = id; +	_tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id);  #line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_name = _tmp2_; -#line 4924 "GSettingsEngine.c" +	schema_name = _tmp0_; +#line 4777 "GSettingsEngine.c"  	{ -		gdouble _tmp3_ = 0.0; -		const gchar* _tmp4_; -		gchar* _tmp5_; -		gchar* _tmp6_; -		gdouble _tmp7_; -		gdouble _tmp8_; -#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = key; -#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_); +		gdouble _tmp1_ = 0.0; +		gchar* _tmp2_; +		gchar* _tmp3_; +		gdouble _tmp4_;  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = _tmp5_; +		_tmp2_ = gsettings_configuration_engine_make_gsettings_key (key);  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = gsettings_configuration_engine_get_gs_double (self, schema_name, _tmp6_, &_inner_error_); +		_tmp3_ = _tmp2_;  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp8_ = _tmp7_; +		_tmp4_ = gsettings_configuration_engine_get_gs_double (self, schema_name, _tmp3_, &_inner_error_);  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp6_); +		_g_free0 (_tmp3_);  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = _tmp8_; +		_tmp1_ = _tmp4_;  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4948 "GSettingsEngine.c" -			gdouble _tmp9_ = 0.0; +#line 4795 "GSettingsEngine.c" +			gdouble _tmp5_ = 0.0;  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4952 "GSettingsEngine.c" +#line 4799 "GSettingsEngine.c"  				goto __catch220_configuration_error;  			}  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4958,45 +4805,42 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp9_; -#line 4963 "GSettingsEngine.c" +			return _tmp5_; +#line 4810 "GSettingsEngine.c"  		}  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		result = _tmp3_; +		result = _tmp1_;  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (schema_name);  #line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 4971 "GSettingsEngine.c" +#line 4818 "GSettingsEngine.c"  	}  	goto __finally220;  	__catch220_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp10_; -		const gchar* _tmp11_; -		gdouble _tmp12_; +		GError* _tmp6_; +		const gchar* _tmp7_;  #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp10_ = err; +		_tmp6_ = err;  #line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp11_ = _tmp10_->message; +		_tmp7_ = _tmp6_->message;  #line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:400: GSettingsConfigurationEngine: error: %s", _tmp11_); +		g_critical ("GSettingsEngine.vala:400: GSettingsConfigurationEngine: error: %s", _tmp7_);  #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp12_ = def; -#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		result = _tmp12_; +		result = def;  #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err);  #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (schema_name);  #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 5000 "GSettingsEngine.c" +#line 4844 "GSettingsEngine.c"  	}  	__finally220:  #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5006,17 +4850,21 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat  #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_clear_error (&_inner_error_);  #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	return _tmp13_; -#line 5011 "GSettingsEngine.c" +	return _tmp8_; +#line 4855 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_plugin_double (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gdouble val) { +static void +gsettings_configuration_engine_real_set_plugin_double (ConfigurationEngine* base, +                                                       const gchar* domain, +                                                       const gchar* id, +                                                       const gchar* key, +                                                       gdouble val) +{  	GSettingsConfigurationEngine * self;  	gchar* schema_name = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_; -	gchar* _tmp2_; +	gchar* _tmp0_;  	GError * _inner_error_ = NULL;  #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5027,36 +4875,26 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration  #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = domain; +	_tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id);  #line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = id; -#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_name = _tmp2_; -#line 5038 "GSettingsEngine.c" +	schema_name = _tmp0_; +#line 4882 "GSettingsEngine.c"  	{ -		const gchar* _tmp3_; -		gchar* _tmp4_; -		gchar* _tmp5_; -		gdouble _tmp6_; +		gchar* _tmp1_; +		gchar* _tmp2_;  #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = key; +		_tmp1_ = gsettings_configuration_engine_make_gsettings_key (key);  #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); +		_tmp2_ = _tmp1_;  #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = _tmp4_; -#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = val; -#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		gsettings_configuration_engine_set_gs_double (self, schema_name, _tmp5_, _tmp6_, &_inner_error_); +		gsettings_configuration_engine_set_gs_double (self, schema_name, _tmp2_, val, &_inner_error_);  #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp5_); +		_g_free0 (_tmp2_);  #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5060 "GSettingsEngine.c" +#line 4898 "GSettingsEngine.c"  				goto __catch221_configuration_error;  			}  #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5067,28 +4905,28 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration  			g_clear_error (&_inner_error_);  #line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 5071 "GSettingsEngine.c" +#line 4909 "GSettingsEngine.c"  		}  	}  	goto __finally221;  	__catch221_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp7_; -		const gchar* _tmp8_; +		GError* _tmp3_; +		const gchar* _tmp4_;  #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = err; +		_tmp3_ = err;  #line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp8_ = _tmp7_->message; +		_tmp4_ = _tmp3_->message;  #line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:411: GSettingsConfigurationEngine: error: %s", _tmp8_); +		g_critical ("GSettingsEngine.vala:411: GSettingsConfigurationEngine: error: %s", _tmp4_);  #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err); -#line 5092 "GSettingsEngine.c" +#line 4930 "GSettingsEngine.c"  	}  	__finally221:  #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5101,22 +4939,26 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration  		g_clear_error (&_inner_error_);  #line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return; -#line 5105 "GSettingsEngine.c" +#line 4943 "GSettingsEngine.c"  	}  #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (schema_name); -#line 5109 "GSettingsEngine.c" +#line 4947 "GSettingsEngine.c"  } -static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gint def) { +static gint +gsettings_configuration_engine_real_get_plugin_int (ConfigurationEngine* base, +                                                    const gchar* domain, +                                                    const gchar* id, +                                                    const gchar* key, +                                                    gint def) +{  	GSettingsConfigurationEngine * self;  	gint result = 0;  	gchar* schema_name = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_; -	gchar* _tmp2_; -	gint _tmp13_ = 0; +	gchar* _tmp0_; +	gint _tmp8_ = 0;  	GError * _inner_error_ = NULL;  #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5127,42 +4969,32 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng  #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (key != NULL, 0);  #line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = domain; +	_tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id);  #line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = id; -#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_name = _tmp2_; -#line 5138 "GSettingsEngine.c" +	schema_name = _tmp0_; +#line 4976 "GSettingsEngine.c"  	{ -		gint _tmp3_ = 0; -		const gchar* _tmp4_; -		gchar* _tmp5_; -		gchar* _tmp6_; -		gint _tmp7_; -		gint _tmp8_; +		gint _tmp1_ = 0; +		gchar* _tmp2_; +		gchar* _tmp3_; +		gint _tmp4_;  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = key; +		_tmp2_ = gsettings_configuration_engine_make_gsettings_key (key);  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_); +		_tmp3_ = _tmp2_;  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = _tmp5_; +		_tmp4_ = gsettings_configuration_engine_get_gs_int (self, schema_name, _tmp3_, &_inner_error_);  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = gsettings_configuration_engine_get_gs_int (self, schema_name, _tmp6_, &_inner_error_); -#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp8_ = _tmp7_; -#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp6_); +		_g_free0 (_tmp3_);  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = _tmp8_; +		_tmp1_ = _tmp4_;  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5162 "GSettingsEngine.c" -			gint _tmp9_ = 0; +#line 4994 "GSettingsEngine.c" +			gint _tmp5_ = 0;  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5166 "GSettingsEngine.c" +#line 4998 "GSettingsEngine.c"  				goto __catch222_configuration_error;  			}  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5172,45 +5004,42 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			g_clear_error (&_inner_error_);  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			return _tmp9_; -#line 5177 "GSettingsEngine.c" +			return _tmp5_; +#line 5009 "GSettingsEngine.c"  		}  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		result = _tmp3_; +		result = _tmp1_;  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (schema_name);  #line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 5185 "GSettingsEngine.c" +#line 5017 "GSettingsEngine.c"  	}  	goto __finally222;  	__catch222_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp10_; -		const gchar* _tmp11_; -		gint _tmp12_; +		GError* _tmp6_; +		const gchar* _tmp7_;  #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp10_ = err; +		_tmp6_ = err;  #line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp11_ = _tmp10_->message; +		_tmp7_ = _tmp6_->message;  #line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:421: GSettingsConfigurationEngine: error: %s", _tmp11_); -#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp12_ = def; +		g_critical ("GSettingsEngine.vala:421: GSettingsConfigurationEngine: error: %s", _tmp7_);  #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		result = _tmp12_; +		result = def;  #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err);  #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (schema_name);  #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 5214 "GSettingsEngine.c" +#line 5043 "GSettingsEngine.c"  	}  	__finally222:  #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5220,17 +5049,21 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng  #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_clear_error (&_inner_error_);  #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	return _tmp13_; -#line 5225 "GSettingsEngine.c" +	return _tmp8_; +#line 5054 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, gint val) { +static void +gsettings_configuration_engine_real_set_plugin_int (ConfigurationEngine* base, +                                                    const gchar* domain, +                                                    const gchar* id, +                                                    const gchar* key, +                                                    gint val) +{  	GSettingsConfigurationEngine * self;  	gchar* schema_name = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_; -	gchar* _tmp2_; +	gchar* _tmp0_;  	GError * _inner_error_ = NULL;  #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5241,36 +5074,26 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng  #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = domain; -#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = id; +	_tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id);  #line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); -#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_name = _tmp2_; -#line 5252 "GSettingsEngine.c" +	schema_name = _tmp0_; +#line 5081 "GSettingsEngine.c"  	{ -		const gchar* _tmp3_; -		gchar* _tmp4_; -		gchar* _tmp5_; -		gint _tmp6_; +		gchar* _tmp1_; +		gchar* _tmp2_;  #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = key; +		_tmp1_ = gsettings_configuration_engine_make_gsettings_key (key);  #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); +		_tmp2_ = _tmp1_;  #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = _tmp4_; +		gsettings_configuration_engine_set_gs_int (self, schema_name, _tmp2_, val, &_inner_error_);  #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = val; -#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		gsettings_configuration_engine_set_gs_int (self, schema_name, _tmp5_, _tmp6_, &_inner_error_); -#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp5_); +		_g_free0 (_tmp2_);  #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5274 "GSettingsEngine.c" +#line 5097 "GSettingsEngine.c"  				goto __catch223_configuration_error;  			}  #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5281,28 +5104,28 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng  			g_clear_error (&_inner_error_);  #line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 5285 "GSettingsEngine.c" +#line 5108 "GSettingsEngine.c"  		}  	}  	goto __finally223;  	__catch223_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp7_; -		const gchar* _tmp8_; +		GError* _tmp3_; +		const gchar* _tmp4_;  #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = err; +		_tmp3_ = err;  #line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp8_ = _tmp7_->message; +		_tmp4_ = _tmp3_->message;  #line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:432: GSettingsConfigurationEngine: error: %s", _tmp8_); +		g_critical ("GSettingsEngine.vala:432: GSettingsConfigurationEngine: error: %s", _tmp4_);  #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err); -#line 5306 "GSettingsEngine.c" +#line 5129 "GSettingsEngine.c"  	}  	__finally223:  #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5315,21 +5138,25 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng  		g_clear_error (&_inner_error_);  #line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return; -#line 5319 "GSettingsEngine.c" +#line 5142 "GSettingsEngine.c"  	}  #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (schema_name); -#line 5323 "GSettingsEngine.c" +#line 5146 "GSettingsEngine.c"  } -static gchar* gsettings_configuration_engine_real_get_plugin_string (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) { +static gchar* +gsettings_configuration_engine_real_get_plugin_string (ConfigurationEngine* base, +                                                       const gchar* domain, +                                                       const gchar* id, +                                                       const gchar* key, +                                                       const gchar* def) +{  	GSettingsConfigurationEngine * self;  	gchar* result = NULL;  	gchar* schema_name = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_; -	gchar* _tmp2_; +	gchar* _tmp0_;  	GError * _inner_error_ = NULL;  #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5340,41 +5167,34 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati  #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (key != NULL, NULL);  #line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = domain; -#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = id; -#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); +	_tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id);  #line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_name = _tmp2_; -#line 5351 "GSettingsEngine.c" +	schema_name = _tmp0_; +#line 5174 "GSettingsEngine.c"  	{ -		gchar* _tmp3_ = NULL; -		const gchar* _tmp4_; +		gchar* _tmp1_ = NULL; +		gchar* _tmp2_; +		gchar* _tmp3_; +		gchar* _tmp4_;  		gchar* _tmp5_;  		gchar* _tmp6_; -		gchar* _tmp7_; -		gchar* _tmp8_; -		gchar* _tmp9_;  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = key; +		_tmp2_ = gsettings_configuration_engine_make_gsettings_key (key);  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_); +		_tmp3_ = _tmp2_;  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = _tmp5_; +		_tmp4_ = gsettings_configuration_engine_get_gs_string (self, schema_name, _tmp3_, &_inner_error_);  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = gsettings_configuration_engine_get_gs_string (self, schema_name, _tmp6_, &_inner_error_); -#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp8_ = _tmp7_; +		_tmp5_ = _tmp4_;  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp6_); +		_g_free0 (_tmp3_);  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = _tmp8_; +		_tmp1_ = _tmp5_;  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5378 "GSettingsEngine.c" +#line 5198 "GSettingsEngine.c"  				goto __catch224_configuration_error;  			}  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5385,53 +5205,50 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati  			g_clear_error (&_inner_error_);  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return NULL; -#line 5389 "GSettingsEngine.c" +#line 5209 "GSettingsEngine.c"  		}  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp9_ = _tmp3_; +		_tmp6_ = _tmp1_;  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = NULL; +		_tmp1_ = NULL;  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		result = _tmp9_; +		result = _tmp6_;  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp3_); +		_g_free0 (_tmp1_);  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (schema_name);  #line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 5403 "GSettingsEngine.c" +#line 5223 "GSettingsEngine.c"  	}  	goto __finally224;  	__catch224_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp10_; -		const gchar* _tmp11_; -		const gchar* _tmp12_; -		gchar* _tmp13_; +		GError* _tmp7_; +		const gchar* _tmp8_; +		gchar* _tmp9_;  #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp10_ = err; +		_tmp7_ = err;  #line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp11_ = _tmp10_->message; +		_tmp8_ = _tmp7_->message;  #line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:442: GSettingsConfigurationEngine: error: %s", _tmp11_); +		g_critical ("GSettingsEngine.vala:442: GSettingsConfigurationEngine: error: %s", _tmp8_);  #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp12_ = def; +		_tmp9_ = g_strdup (def);  #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp13_ = g_strdup (_tmp12_); -#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		result = _tmp13_; +		result = _tmp9_;  #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err);  #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (schema_name);  #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 5435 "GSettingsEngine.c" +#line 5252 "GSettingsEngine.c"  	}  	__finally224:  #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5442,16 +5259,20 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati  	g_clear_error (&_inner_error_);  #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return NULL; -#line 5446 "GSettingsEngine.c" +#line 5263 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_plugin_string (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) { +static void +gsettings_configuration_engine_real_set_plugin_string (ConfigurationEngine* base, +                                                       const gchar* domain, +                                                       const gchar* id, +                                                       const gchar* key, +                                                       const gchar* val) +{  	GSettingsConfigurationEngine * self;  	gchar* schema_name = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_; -	gchar* _tmp2_; +	gchar* _tmp0_;  	GError * _inner_error_ = NULL;  #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5462,36 +5283,26 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration  #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = domain; -#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = id; -#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); +	_tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id);  #line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_name = _tmp2_; -#line 5473 "GSettingsEngine.c" +	schema_name = _tmp0_; +#line 5290 "GSettingsEngine.c"  	{ -		const gchar* _tmp3_; -		gchar* _tmp4_; -		gchar* _tmp5_; -		const gchar* _tmp6_; +		gchar* _tmp1_; +		gchar* _tmp2_;  #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = key; +		_tmp1_ = gsettings_configuration_engine_make_gsettings_key (key);  #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); -#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = _tmp4_; +		_tmp2_ = _tmp1_;  #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = val; +		gsettings_configuration_engine_set_gs_string (self, schema_name, _tmp2_, val, &_inner_error_);  #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		gsettings_configuration_engine_set_gs_string (self, schema_name, _tmp5_, _tmp6_, &_inner_error_); -#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp5_); +		_g_free0 (_tmp2_);  #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5495 "GSettingsEngine.c" +#line 5306 "GSettingsEngine.c"  				goto __catch225_configuration_error;  			}  #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5502,28 +5313,28 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration  			g_clear_error (&_inner_error_);  #line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 5506 "GSettingsEngine.c" +#line 5317 "GSettingsEngine.c"  		}  	}  	goto __finally225;  	__catch225_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp7_; -		const gchar* _tmp8_; +		GError* _tmp3_; +		const gchar* _tmp4_;  #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = err; +		_tmp3_ = err;  #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp8_ = _tmp7_->message; +		_tmp4_ = _tmp3_->message;  #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:453: GSettingsConfigurationEngine: error: %s", _tmp8_); +		g_critical ("GSettingsEngine.vala:453: GSettingsConfigurationEngine: error: %s", _tmp4_);  #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err); -#line 5527 "GSettingsEngine.c" +#line 5338 "GSettingsEngine.c"  	}  	__finally225:  #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5536,20 +5347,23 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration  		g_clear_error (&_inner_error_);  #line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return; -#line 5540 "GSettingsEngine.c" +#line 5351 "GSettingsEngine.c"  	}  #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (schema_name); -#line 5544 "GSettingsEngine.c" +#line 5355 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationEngine* base, const gchar* domain, const gchar* id, const gchar* key) { +static void +gsettings_configuration_engine_real_unset_plugin_key (ConfigurationEngine* base, +                                                      const gchar* domain, +                                                      const gchar* id, +                                                      const gchar* key) +{  	GSettingsConfigurationEngine * self;  	gchar* schema_name = NULL; -	const gchar* _tmp0_; -	const gchar* _tmp1_; -	gchar* _tmp2_; +	gchar* _tmp0_;  	GError * _inner_error_ = NULL;  #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5560,33 +5374,26 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE  #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (key != NULL);  #line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = domain; -#line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = id; -#line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); +	_tmp0_ = gsettings_configuration_engine_make_plugin_schema_name (domain, id);  #line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	schema_name = _tmp2_; -#line 5571 "GSettingsEngine.c" +	schema_name = _tmp0_; +#line 5381 "GSettingsEngine.c"  	{ -		const gchar* _tmp3_; -		gchar* _tmp4_; -		gchar* _tmp5_; +		gchar* _tmp1_; +		gchar* _tmp2_;  #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = key; +		_tmp1_ = gsettings_configuration_engine_make_gsettings_key (key);  #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_); +		_tmp2_ = _tmp1_;  #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = _tmp4_; +		gsettings_configuration_engine_reset_gs_to_default (self, schema_name, _tmp2_, &_inner_error_);  #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		gsettings_configuration_engine_reset_gs_to_default (self, schema_name, _tmp5_, &_inner_error_); -#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_g_free0 (_tmp5_); +		_g_free0 (_tmp2_);  #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5590 "GSettingsEngine.c" +#line 5397 "GSettingsEngine.c"  				goto __catch226_configuration_error;  			}  #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5597,28 +5404,28 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE  			g_clear_error (&_inner_error_);  #line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 5601 "GSettingsEngine.c" +#line 5408 "GSettingsEngine.c"  		}  	}  	goto __finally226;  	__catch226_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp6_; -		const gchar* _tmp7_; +		GError* _tmp3_; +		const gchar* _tmp4_;  #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = err; +		_tmp3_ = err;  #line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp7_ = _tmp6_->message; +		_tmp4_ = _tmp3_->message;  #line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:463: GSettingsConfigurationEngine: error: %s", _tmp7_); +		g_critical ("GSettingsEngine.vala:463: GSettingsConfigurationEngine: error: %s", _tmp4_);  #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err); -#line 5622 "GSettingsEngine.c" +#line 5429 "GSettingsEngine.c"  	}  	__finally226:  #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5631,45 +5438,42 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE  		g_clear_error (&_inner_error_);  #line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return; -#line 5635 "GSettingsEngine.c" +#line 5442 "GSettingsEngine.c"  	}  #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (schema_name); -#line 5639 "GSettingsEngine.c" +#line 5446 "GSettingsEngine.c"  } -static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled (ConfigurationEngine* base, const gchar* id) { +static FuzzyPropertyState +gsettings_configuration_engine_real_is_plugin_enabled (ConfigurationEngine* base, +                                                       const gchar* id) +{  	GSettingsConfigurationEngine * self;  	FuzzyPropertyState result = 0;  	gchar* enable_disable_name = NULL; -	const gchar* _tmp0_; -	gchar* _tmp1_; +	gchar* _tmp0_;  	GError * _inner_error_ = NULL;  #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);  #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_val_if_fail (id != NULL, 0);  #line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = id; -#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_); +	_tmp0_ = gsettings_configuration_engine_get_plugin_enable_disable_name (id);  #line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	enable_disable_name = _tmp1_; -#line 5660 "GSettingsEngine.c" +	enable_disable_name = _tmp0_; +#line 5467 "GSettingsEngine.c"  	{ -		FuzzyPropertyState _tmp2_ = 0; -		gboolean _tmp3_ = FALSE; -		gboolean _tmp4_; +		FuzzyPropertyState _tmp1_ = 0; +		gboolean _tmp2_ = FALSE;  #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = gsettings_configuration_engine_get_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, &_inner_error_); -#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = _tmp4_; +		_tmp2_ = gsettings_configuration_engine_get_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, &_inner_error_);  #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5673 "GSettingsEngine.c" +#line 5477 "GSettingsEngine.c"  				goto __catch227_configuration_error;  			}  #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5680,42 +5484,42 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled  			g_clear_error (&_inner_error_);  #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return 0; -#line 5684 "GSettingsEngine.c" +#line 5488 "GSettingsEngine.c"  		}  #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		if (_tmp3_) { +		if (_tmp2_) {  #line 472 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			_tmp2_ = FUZZY_PROPERTY_STATE_ENABLED; -#line 5690 "GSettingsEngine.c" +			_tmp1_ = FUZZY_PROPERTY_STATE_ENABLED; +#line 5494 "GSettingsEngine.c"  		} else {  #line 472 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -			_tmp2_ = FUZZY_PROPERTY_STATE_DISABLED; -#line 5694 "GSettingsEngine.c" +			_tmp1_ = FUZZY_PROPERTY_STATE_DISABLED; +#line 5498 "GSettingsEngine.c"  		}  #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		result = _tmp2_; +		result = _tmp1_;  #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_free0 (enable_disable_name);  #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 5702 "GSettingsEngine.c" +#line 5506 "GSettingsEngine.c"  	}  	goto __finally227;  	__catch227_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp5_; -		const gchar* _tmp6_; +		GError* _tmp3_; +		const gchar* _tmp4_;  #line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 474 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp5_ = err; +		_tmp3_ = err;  #line 474 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp6_ = _tmp5_->message; +		_tmp4_ = _tmp3_->message;  #line 474 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:474: GSettingsConfigurationEngine: error: %s", _tmp6_); +		g_critical ("GSettingsEngine.vala:474: GSettingsConfigurationEngine: error: %s", _tmp4_);  #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		result = FUZZY_PROPERTY_STATE_UNKNOWN;  #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5724,7 +5528,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled  		_g_free0 (enable_disable_name);  #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return result; -#line 5728 "GSettingsEngine.c" +#line 5532 "GSettingsEngine.c"  	}  	__finally227:  #line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5735,38 +5539,36 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled  	g_clear_error (&_inner_error_);  #line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	return 0; -#line 5739 "GSettingsEngine.c" +#line 5543 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, const gchar* id, gboolean enabled) { +static void +gsettings_configuration_engine_real_set_plugin_enabled (ConfigurationEngine* base, +                                                        const gchar* id, +                                                        gboolean enabled) +{  	GSettingsConfigurationEngine * self;  	gchar* enable_disable_name = NULL; -	const gchar* _tmp0_; -	gchar* _tmp1_; +	gchar* _tmp0_;  	GError * _inner_error_ = NULL;  #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);  #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_return_if_fail (id != NULL);  #line 480 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp0_ = id; +	_tmp0_ = gsettings_configuration_engine_get_plugin_enable_disable_name (id);  #line 480 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	_tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_); -#line 480 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -	enable_disable_name = _tmp1_; -#line 5759 "GSettingsEngine.c" +	enable_disable_name = _tmp0_; +#line 5564 "GSettingsEngine.c"  	{ -		gboolean _tmp2_; -#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp2_ = enabled;  #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		gsettings_configuration_engine_set_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, _tmp2_, &_inner_error_); +		gsettings_configuration_engine_set_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, enabled, &_inner_error_);  #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5770 "GSettingsEngine.c" +#line 5572 "GSettingsEngine.c"  				goto __catch228_configuration_error;  			}  #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5777,28 +5579,28 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio  			g_clear_error (&_inner_error_);  #line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  			return; -#line 5781 "GSettingsEngine.c" +#line 5583 "GSettingsEngine.c"  		}  	}  	goto __finally228;  	__catch228_configuration_error:  	{  		GError* err = NULL; -		GError* _tmp3_; -		const gchar* _tmp4_; +		GError* _tmp1_; +		const gchar* _tmp2_;  #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		err = _inner_error_;  #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_inner_error_ = NULL;  #line 485 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp3_ = err; +		_tmp1_ = err;  #line 485 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		_tmp4_ = _tmp3_->message; +		_tmp2_ = _tmp1_->message;  #line 485 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" -		g_critical ("GSettingsEngine.vala:485: GSettingsConfigurationEngine: error: %s", _tmp4_); +		g_critical ("GSettingsEngine.vala:485: GSettingsConfigurationEngine: error: %s", _tmp2_);  #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err); -#line 5802 "GSettingsEngine.c" +#line 5604 "GSettingsEngine.c"  	}  	__finally228:  #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5811,15 +5613,17 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio  		g_clear_error (&_inner_error_);  #line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return; -#line 5815 "GSettingsEngine.c" +#line 5617 "GSettingsEngine.c"  	}  #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (enable_disable_name); -#line 5819 "GSettingsEngine.c" +#line 5621 "GSettingsEngine.c"  } -void gsettings_configuration_engine_run_gsettings_migrator (void) { +void +gsettings_configuration_engine_run_gsettings_migrator (void) +{  	gchar* cmd_line = NULL;  	GFile* _tmp0_;  	GFile* _tmp1_; @@ -5846,13 +5650,13 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {  	_g_object_unref0 (_tmp1_);  #line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	cmd_line = _tmp5_; -#line 5850 "GSettingsEngine.c" +#line 5654 "GSettingsEngine.c"  	{  #line 497 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		g_spawn_command_line_sync (cmd_line, NULL, NULL, NULL, &_inner_error_);  #line 497 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5856 "GSettingsEngine.c" +#line 5660 "GSettingsEngine.c"  			goto __catch229_g_error;  		}  	} @@ -5874,7 +5678,7 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {  		g_message ("GSettingsEngine.vala:499: Error running shotwell-settings-migrator: %s", _tmp7_);  #line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		_g_error_free0 (err); -#line 5878 "GSettingsEngine.c" +#line 5682 "GSettingsEngine.c"  	}  	__finally229:  #line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5887,26 +5691,30 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {  		g_clear_error (&_inner_error_);  #line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  		return; -#line 5891 "GSettingsEngine.c" +#line 5695 "GSettingsEngine.c"  	}  #line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	_g_free0 (cmd_line); -#line 5895 "GSettingsEngine.c" +#line 5699 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_class_init (GSettingsConfigurationEngineClass * klass) { +static void +gsettings_configuration_engine_class_init (GSettingsConfigurationEngineClass * klass) +{  #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	gsettings_configuration_engine_parent_class = g_type_class_peek_parent (klass);  #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	g_type_class_add_private (klass, sizeof (GSettingsConfigurationEnginePrivate));  #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	G_OBJECT_CLASS (klass)->finalize = gsettings_configuration_engine_finalize; -#line 5906 "GSettingsEngine.c" +#line 5712 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_configuration_engine_interface_init (ConfigurationEngineIface * iface) { +static void +gsettings_configuration_engine_configuration_engine_interface_init (ConfigurationEngineIface * iface) +{  #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	gsettings_configuration_engine_configuration_engine_parent_iface = g_type_interface_peek_parent (iface);  #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5953,18 +5761,22 @@ static void gsettings_configuration_engine_configuration_engine_interface_init (  	iface->is_plugin_enabled = (FuzzyPropertyState (*) (ConfigurationEngine *, const gchar*)) gsettings_configuration_engine_real_is_plugin_enabled;  #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	iface->set_plugin_enabled = (void (*) (ConfigurationEngine *, const gchar*, gboolean)) gsettings_configuration_engine_real_set_plugin_enabled; -#line 5957 "GSettingsEngine.c" +#line 5765 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_instance_init (GSettingsConfigurationEngine * self) { +static void +gsettings_configuration_engine_instance_init (GSettingsConfigurationEngine * self) +{  #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self->priv = GSETTINGS_CONFIGURATION_ENGINE_GET_PRIVATE (self); -#line 5964 "GSettingsEngine.c" +#line 5774 "GSettingsEngine.c"  } -static void gsettings_configuration_engine_finalize (GObject * obj) { +static void +gsettings_configuration_engine_finalize (GObject * obj) +{  	GSettingsConfigurationEngine * self;  #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -5974,11 +5786,13 @@ static void gsettings_configuration_engine_finalize (GObject * obj) {  	self->priv->key_names = (_vala_array_free (self->priv->key_names, self->priv->key_names_length1, (GDestroyNotify) g_free), NULL);  #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"  	G_OBJECT_CLASS (gsettings_configuration_engine_parent_class)->finalize (obj); -#line 5978 "GSettingsEngine.c" +#line 5790 "GSettingsEngine.c"  } -GType gsettings_configuration_engine_get_type (void) { +GType +gsettings_configuration_engine_get_type (void) +{  	static volatile gsize gsettings_configuration_engine_type_id__volatile = 0;  	if (g_once_init_enter (&gsettings_configuration_engine_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (GSettingsConfigurationEngineClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gsettings_configuration_engine_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GSettingsConfigurationEngine), 0, (GInstanceInitFunc) gsettings_configuration_engine_instance_init, NULL }; @@ -5992,7 +5806,11 @@ GType gsettings_configuration_engine_get_type (void) {  } -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) { @@ -6004,7 +5822,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);  } | 
