From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/config/GSettingsEngine.c | 587 +++++++++++++++++++++++-------------------- 1 file changed, 310 insertions(+), 277 deletions(-) (limited to 'src/config/GSettingsEngine.c') diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c index 873e431..d70a944 100644 --- a/src/config/GSettingsEngine.c +++ b/src/config/GSettingsEngine.c @@ -1,4 +1,4 @@ -/* GSettingsEngine.c generated by valac 0.34.4, the Vala compiler +/* GSettingsEngine.c generated by valac 0.34.7, the Vala compiler * generated from GSettingsEngine.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2655,11 +2655,11 @@ static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurati const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GSettings* schema_object = NULL; - const gchar* _tmp2_ = NULL; - GSettings* _tmp3_ = NULL; - GSettings* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + const gchar* _tmp4_ = NULL; + GSettings* _tmp5_ = NULL; + GSettings* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; + gboolean _tmp8_ = FALSE; GError * _inner_error_ = NULL; #line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), FALSE); @@ -2677,40 +2677,43 @@ static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurati if (G_UNLIKELY (_inner_error_ != NULL)) { #line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { +#line 2681 "GSettingsEngine.c" + gboolean _tmp2_ = FALSE; #line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return FALSE; -#line 2685 "GSettingsEngine.c" + return _tmp2_; +#line 2687 "GSettingsEngine.c" } else { + gboolean _tmp3_ = FALSE; #line 188 "/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 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return FALSE; -#line 2693 "GSettingsEngine.c" + return _tmp3_; +#line 2696 "GSettingsEngine.c" } } #line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; + _tmp4_ = schema; #line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); + _tmp5_ = g_settings_new (_tmp4_); #line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; + schema_object = _tmp5_; #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + _tmp6_ = schema_object; #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; + _tmp7_ = key; #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = g_settings_get_boolean (_tmp4_, _tmp5_); + _tmp8_ = g_settings_get_boolean (_tmp6_, _tmp7_); #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp6_; + result = _tmp8_; #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 2714 "GSettingsEngine.c" +#line 2717 "GSettingsEngine.c" } @@ -2744,7 +2747,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn g_propagate_error (error, _inner_error_); #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2748 "GSettingsEngine.c" +#line 2751 "GSettingsEngine.c" } else { #line 196 "/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); @@ -2752,7 +2755,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn g_clear_error (&_inner_error_); #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2756 "GSettingsEngine.c" +#line 2759 "GSettingsEngine.c" } } #line 198 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2771,7 +2774,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn g_settings_set_boolean (_tmp4_, _tmp5_, _tmp6_); #line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 2775 "GSettingsEngine.c" +#line 2778 "GSettingsEngine.c" } @@ -2805,7 +2808,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn g_propagate_error (error, _inner_error_); #line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2809 "GSettingsEngine.c" +#line 2812 "GSettingsEngine.c" } else { #line 204 "/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); @@ -2813,7 +2816,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn g_clear_error (&_inner_error_); #line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2817 "GSettingsEngine.c" +#line 2820 "GSettingsEngine.c" } } #line 206 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -2832,7 +2835,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn g_settings_set_enum (_tmp4_, _tmp5_, _tmp6_); #line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 2836 "GSettingsEngine.c" +#line 2839 "GSettingsEngine.c" } @@ -2841,11 +2844,11 @@ static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEn const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GSettings* schema_object = NULL; - const gchar* _tmp2_ = NULL; - GSettings* _tmp3_ = NULL; - GSettings* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gint _tmp6_ = 0; + const gchar* _tmp4_ = NULL; + GSettings* _tmp5_ = NULL; + GSettings* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; + gint _tmp8_ = 0; GError * _inner_error_ = NULL; #line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0); @@ -2863,40 +2866,43 @@ static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEn if (G_UNLIKELY (_inner_error_ != NULL)) { #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { +#line 2870 "GSettingsEngine.c" + gint _tmp2_ = 0; #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 2871 "GSettingsEngine.c" + return _tmp2_; +#line 2876 "GSettingsEngine.c" } else { + gint _tmp3_ = 0; #line 211 "/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 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 2879 "GSettingsEngine.c" + return _tmp3_; +#line 2885 "GSettingsEngine.c" } } #line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; + _tmp4_ = schema; #line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); + _tmp5_ = g_settings_new (_tmp4_); #line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; + schema_object = _tmp5_; #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + _tmp6_ = schema_object; #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; + _tmp7_ = key; #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = g_settings_get_enum (_tmp4_, _tmp5_); + _tmp8_ = g_settings_get_enum (_tmp6_, _tmp7_); #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp6_; + result = _tmp8_; #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 2900 "GSettingsEngine.c" +#line 2906 "GSettingsEngine.c" } @@ -2905,11 +2911,11 @@ static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEng const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GSettings* schema_object = NULL; - const gchar* _tmp2_ = NULL; - GSettings* _tmp3_ = NULL; - GSettings* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gint _tmp6_ = 0; + const gchar* _tmp4_ = NULL; + GSettings* _tmp5_ = NULL; + GSettings* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; + gint _tmp8_ = 0; GError * _inner_error_ = NULL; #line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0); @@ -2927,40 +2933,43 @@ static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEng if (G_UNLIKELY (_inner_error_ != NULL)) { #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { +#line 2937 "GSettingsEngine.c" + gint _tmp2_ = 0; #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 2935 "GSettingsEngine.c" + return _tmp2_; +#line 2943 "GSettingsEngine.c" } else { + gint _tmp3_ = 0; #line 218 "/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 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 2943 "GSettingsEngine.c" + return _tmp3_; +#line 2952 "GSettingsEngine.c" } } #line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; + _tmp4_ = schema; #line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); + _tmp5_ = g_settings_new (_tmp4_); #line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; + schema_object = _tmp5_; #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + _tmp6_ = schema_object; #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; + _tmp7_ = key; #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = g_settings_get_int (_tmp4_, _tmp5_); + _tmp8_ = g_settings_get_int (_tmp6_, _tmp7_); #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp6_; + result = _tmp8_; #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 2964 "GSettingsEngine.c" +#line 2973 "GSettingsEngine.c" } @@ -2994,7 +3003,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng g_propagate_error (error, _inner_error_); #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 2998 "GSettingsEngine.c" +#line 3007 "GSettingsEngine.c" } else { #line 226 "/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); @@ -3002,7 +3011,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng g_clear_error (&_inner_error_); #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3006 "GSettingsEngine.c" +#line 3015 "GSettingsEngine.c" } } #line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3021,7 +3030,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng g_settings_set_int (_tmp4_, _tmp5_, _tmp6_); #line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 3025 "GSettingsEngine.c" +#line 3034 "GSettingsEngine.c" } @@ -3030,11 +3039,11 @@ static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurat const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GSettings* schema_object = NULL; - const gchar* _tmp2_ = NULL; - GSettings* _tmp3_ = NULL; - GSettings* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gdouble _tmp6_ = 0.0; + const gchar* _tmp4_ = NULL; + GSettings* _tmp5_ = NULL; + GSettings* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; + gdouble _tmp8_ = 0.0; GError * _inner_error_ = NULL; #line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0.0); @@ -3052,40 +3061,43 @@ static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurat if (G_UNLIKELY (_inner_error_ != NULL)) { #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { +#line 3065 "GSettingsEngine.c" + gdouble _tmp2_ = 0.0; #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0.0; -#line 3060 "GSettingsEngine.c" + return _tmp2_; +#line 3071 "GSettingsEngine.c" } else { + gdouble _tmp3_ = 0.0; #line 234 "/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 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0.0; -#line 3068 "GSettingsEngine.c" + return _tmp3_; +#line 3080 "GSettingsEngine.c" } } #line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp2_ = schema; + _tmp4_ = schema; #line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp3_ = g_settings_new (_tmp2_); + _tmp5_ = g_settings_new (_tmp4_); #line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - schema_object = _tmp3_; + schema_object = _tmp5_; #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp4_ = schema_object; + _tmp6_ = schema_object; #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp5_ = key; + _tmp7_ = key; #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp6_ = g_settings_get_double (_tmp4_, _tmp5_); + _tmp8_ = g_settings_get_double (_tmp6_, _tmp7_); #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp6_; + result = _tmp8_; #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3089 "GSettingsEngine.c" +#line 3101 "GSettingsEngine.c" } @@ -3119,7 +3131,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration g_propagate_error (error, _inner_error_); #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3123 "GSettingsEngine.c" +#line 3135 "GSettingsEngine.c" } else { #line 242 "/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); @@ -3127,7 +3139,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration g_clear_error (&_inner_error_); #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3131 "GSettingsEngine.c" +#line 3143 "GSettingsEngine.c" } } #line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3146,7 +3158,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration g_settings_set_double (_tmp4_, _tmp5_, _tmp6_); #line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 3150 "GSettingsEngine.c" +#line 3162 "GSettingsEngine.c" } @@ -3181,7 +3193,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati g_propagate_error (error, _inner_error_); #line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 3185 "GSettingsEngine.c" +#line 3197 "GSettingsEngine.c" } else { #line 250 "/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); @@ -3189,7 +3201,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati g_clear_error (&_inner_error_); #line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 3193 "GSettingsEngine.c" +#line 3205 "GSettingsEngine.c" } } #line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3210,7 +3222,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati _g_object_unref0 (schema_object); #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3214 "GSettingsEngine.c" +#line 3226 "GSettingsEngine.c" } @@ -3246,7 +3258,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration g_propagate_error (error, _inner_error_); #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3250 "GSettingsEngine.c" +#line 3262 "GSettingsEngine.c" } else { #line 258 "/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); @@ -3254,7 +3266,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration g_clear_error (&_inner_error_); #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3258 "GSettingsEngine.c" +#line 3270 "GSettingsEngine.c" } } #line 260 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3273,7 +3285,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration g_settings_set_string (_tmp4_, _tmp5_, _tmp6_); #line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 3277 "GSettingsEngine.c" +#line 3289 "GSettingsEngine.c" } @@ -3306,7 +3318,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu g_propagate_error (error, _inner_error_); #line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3310 "GSettingsEngine.c" +#line 3322 "GSettingsEngine.c" } else { #line 266 "/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); @@ -3314,7 +3326,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu g_clear_error (&_inner_error_); #line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3318 "GSettingsEngine.c" +#line 3330 "GSettingsEngine.c" } } #line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -3331,7 +3343,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu g_settings_reset (_tmp4_, _tmp5_); #line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_object_unref0 (schema_object); -#line 3335 "GSettingsEngine.c" +#line 3347 "GSettingsEngine.c" } @@ -3344,7 +3356,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_return_val_if_fail (old != NULL, NULL); #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 3348 "GSettingsEngine.c" +#line 3360 "GSettingsEngine.c" { GRegex* regex = NULL; const gchar* _tmp0_ = NULL; @@ -3375,7 +3387,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3379 "GSettingsEngine.c" +#line 3391 "GSettingsEngine.c" goto __catch204_g_regex_error; } #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -3384,7 +3396,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 3388 "GSettingsEngine.c" +#line 3400 "GSettingsEngine.c" } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; @@ -3400,7 +3412,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3404 "GSettingsEngine.c" +#line 3416 "GSettingsEngine.c" goto __catch204_g_regex_error; } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -3411,7 +3423,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 3415 "GSettingsEngine.c" +#line 3427 "GSettingsEngine.c" } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; @@ -3425,7 +3437,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 3429 "GSettingsEngine.c" +#line 3441 "GSettingsEngine.c" } goto __finally204; __catch204_g_regex_error: @@ -3439,7 +3451,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_assert_not_reached (); #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 3443 "GSettingsEngine.c" +#line 3455 "GSettingsEngine.c" } __finally204: #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -3450,7 +3462,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 3454 "GSettingsEngine.c" +#line 3466 "GSettingsEngine.c" } } @@ -3474,7 +3486,7 @@ static gchar* string_strip (const gchar* self) { result = _result_; #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 3478 "GSettingsEngine.c" +#line 3490 "GSettingsEngine.c" } @@ -3511,17 +3523,17 @@ static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id) { _tmp6_ = is_string_empty (_tmp5_); #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (!_tmp6_) { -#line 3515 "GSettingsEngine.c" +#line 3527 "GSettingsEngine.c" const gchar* _tmp7_ = NULL; #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp7_ = cleaned; #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp4_ = _tmp7_; -#line 3521 "GSettingsEngine.c" +#line 3533 "GSettingsEngine.c" } else { #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp4_ = NULL; -#line 3525 "GSettingsEngine.c" +#line 3537 "GSettingsEngine.c" } #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp8_ = g_strdup (_tmp4_); @@ -3531,7 +3543,7 @@ static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id) { _g_free0 (cleaned); #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3535 "GSettingsEngine.c" +#line 3547 "GSettingsEngine.c" } @@ -3557,7 +3569,7 @@ static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (con _tmp2_ = cleaned_id; #line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_tmp2_ == NULL) { -#line 3561 "GSettingsEngine.c" +#line 3573 "GSettingsEngine.c" gchar* _tmp3_ = NULL; #line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp3_ = g_strdup ("default"); @@ -3565,7 +3577,7 @@ static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (con _g_free0 (cleaned_id); #line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" cleaned_id = _tmp3_; -#line 3569 "GSettingsEngine.c" +#line 3581 "GSettingsEngine.c" } #line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp4_ = cleaned_id; @@ -3587,7 +3599,7 @@ static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (con result = cleaned_id; #line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3591 "GSettingsEngine.c" +#line 3603 "GSettingsEngine.c" } @@ -3616,7 +3628,7 @@ static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gcha _tmp2_ = cleaned_id; #line 293 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_tmp2_ == NULL) { -#line 3620 "GSettingsEngine.c" +#line 3632 "GSettingsEngine.c" gchar* _tmp3_ = NULL; #line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp3_ = g_strdup ("default"); @@ -3624,7 +3636,7 @@ static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gcha _g_free0 (cleaned_id); #line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" cleaned_id = _tmp3_; -#line 3628 "GSettingsEngine.c" +#line 3640 "GSettingsEngine.c" } #line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp4_ = cleaned_id; @@ -3646,7 +3658,7 @@ static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gcha _g_free0 (cleaned_id); #line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3650 "GSettingsEngine.c" +#line 3662 "GSettingsEngine.c" } @@ -3664,7 +3676,7 @@ static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gc result = _tmp1_; #line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3668 "GSettingsEngine.c" +#line 3680 "GSettingsEngine.c" } @@ -3680,7 +3692,7 @@ static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine* result = _tmp0_; #line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3684 "GSettingsEngine.c" +#line 3696 "GSettingsEngine.c" } @@ -3724,26 +3736,29 @@ static gint gsettings_configuration_engine_real_get_enum_property (Configuration if (G_UNLIKELY (_inner_error_ != NULL)) { #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { +#line 3740 "GSettingsEngine.c" + gint _tmp8_ = 0; #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 3732 "GSettingsEngine.c" + return _tmp8_; +#line 3746 "GSettingsEngine.c" } else { + gint _tmp9_ = 0; #line 309 "/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 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 3740 "GSettingsEngine.c" + return _tmp9_; +#line 3755 "GSettingsEngine.c" } } #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp0_; #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3747 "GSettingsEngine.c" +#line 3762 "GSettingsEngine.c" } @@ -3790,7 +3805,7 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration g_propagate_error (error, _inner_error_); #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3794 "GSettingsEngine.c" +#line 3809 "GSettingsEngine.c" } else { #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); @@ -3798,14 +3813,14 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration g_clear_error (&_inner_error_); #line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3802 "GSettingsEngine.c" +#line 3817 "GSettingsEngine.c" } } #line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp7_ = p; #line 314 "/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 3809 "GSettingsEngine.c" +#line 3824 "GSettingsEngine.c" } @@ -3849,26 +3864,29 @@ static gint gsettings_configuration_engine_real_get_int_property (ConfigurationE if (G_UNLIKELY (_inner_error_ != NULL)) { #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { +#line 3868 "GSettingsEngine.c" + gint _tmp8_ = 0; #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 3857 "GSettingsEngine.c" + return _tmp8_; +#line 3874 "GSettingsEngine.c" } else { + gint _tmp9_ = 0; #line 318 "/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 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 3865 "GSettingsEngine.c" + return _tmp9_; +#line 3883 "GSettingsEngine.c" } } #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp0_; #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 3872 "GSettingsEngine.c" +#line 3890 "GSettingsEngine.c" } @@ -3915,7 +3933,7 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE g_propagate_error (error, _inner_error_); #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3919 "GSettingsEngine.c" +#line 3937 "GSettingsEngine.c" } else { #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); @@ -3923,14 +3941,14 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE g_clear_error (&_inner_error_); #line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 3927 "GSettingsEngine.c" +#line 3945 "GSettingsEngine.c" } } #line 323 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp7_ = p; #line 323 "/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 3934 "GSettingsEngine.c" +#line 3952 "GSettingsEngine.c" } @@ -3953,7 +3971,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { _tmp3_ = end; #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 3957 "GSettingsEngine.c" +#line 3975 "GSettingsEngine.c" glong _tmp4_ = 0L; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = maxlen; @@ -3961,7 +3979,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = _tmp4_; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 3965 "GSettingsEngine.c" +#line 3983 "GSettingsEngine.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -3973,7 +3991,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = (glong) (_tmp5_ - _tmp6_); #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 3977 "GSettingsEngine.c" +#line 3995 "GSettingsEngine.c" } } @@ -3997,21 +4015,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp1_ = offset; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 4001 "GSettingsEngine.c" +#line 4019 "GSettingsEngine.c" glong _tmp2_ = 0L; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = len; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 4007 "GSettingsEngine.c" +#line 4025 "GSettingsEngine.c" } else { #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 4011 "GSettingsEngine.c" +#line 4029 "GSettingsEngine.c" } #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 4015 "GSettingsEngine.c" +#line 4033 "GSettingsEngine.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; @@ -4023,7 +4041,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 4027 "GSettingsEngine.c" +#line 4045 "GSettingsEngine.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -4033,13 +4051,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp7_ = _tmp6_; #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 4037 "GSettingsEngine.c" +#line 4055 "GSettingsEngine.c" } #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = offset; #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 4043 "GSettingsEngine.c" +#line 4061 "GSettingsEngine.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; @@ -4053,7 +4071,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp11_ = offset; #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 4057 "GSettingsEngine.c" +#line 4075 "GSettingsEngine.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; @@ -4063,13 +4081,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp13_ = string_length; #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 4067 "GSettingsEngine.c" +#line 4085 "GSettingsEngine.c" } #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = len; #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 4073 "GSettingsEngine.c" +#line 4091 "GSettingsEngine.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -4078,7 +4096,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp16_ = offset; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 4082 "GSettingsEngine.c" +#line 4100 "GSettingsEngine.c" } #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = offset; @@ -4098,7 +4116,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { result = _tmp22_; #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 4102 "GSettingsEngine.c" +#line 4120 "GSettingsEngine.c" } @@ -4149,7 +4167,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura g_propagate_error (error, _inner_error_); #line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 4153 "GSettingsEngine.c" +#line 4171 "GSettingsEngine.c" } else { #line 327 "/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); @@ -4157,7 +4175,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura g_clear_error (&_inner_error_); #line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 4161 "GSettingsEngine.c" +#line 4179 "GSettingsEngine.c" } } #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4168,7 +4186,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura _tmp8_ = p; #line 332 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_tmp8_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) { -#line 4172 "GSettingsEngine.c" +#line 4190 "GSettingsEngine.c" gchar* _tmp9_ = NULL; #line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp9_ = string_substring (gs_result, (glong) 7, (glong) -1); @@ -4176,7 +4194,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura _g_free0 (_result_); #line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _result_ = _tmp9_; -#line 4180 "GSettingsEngine.c" +#line 4198 "GSettingsEngine.c" } #line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _result_; @@ -4184,7 +4202,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura _g_free0 (gs_result); #line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4188 "GSettingsEngine.c" +#line 4206 "GSettingsEngine.c" } @@ -4222,18 +4240,18 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati if (_tmp3_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) { #line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp2_ = TRUE; -#line 4226 "GSettingsEngine.c" +#line 4244 "GSettingsEngine.c" } else { ConfigurableProperty _tmp4_ = 0; #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp4_ = p; #line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp2_ = _tmp4_ == CONFIGURABLE_PROPERTY_SCREENSAVER_FILE; -#line 4233 "GSettingsEngine.c" +#line 4251 "GSettingsEngine.c" } #line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_tmp2_) { -#line 4237 "GSettingsEngine.c" +#line 4255 "GSettingsEngine.c" const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; #line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4244,7 +4262,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati _g_free0 (converted_val); #line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" converted_val = _tmp6_; -#line 4248 "GSettingsEngine.c" +#line 4266 "GSettingsEngine.c" } #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp7_ = self->priv->schema_names; @@ -4276,7 +4294,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati _g_free0 (converted_val); #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4280 "GSettingsEngine.c" +#line 4298 "GSettingsEngine.c" } else { #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (converted_val); @@ -4286,7 +4304,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati g_clear_error (&_inner_error_); #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4290 "GSettingsEngine.c" +#line 4308 "GSettingsEngine.c" } } #line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4295,7 +4313,7 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp14_); #line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (converted_val); -#line 4299 "GSettingsEngine.c" +#line 4317 "GSettingsEngine.c" } @@ -4339,26 +4357,29 @@ static gboolean gsettings_configuration_engine_real_get_bool_property (Configura if (G_UNLIKELY (_inner_error_ != NULL)) { #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { +#line 4361 "GSettingsEngine.c" + gboolean _tmp8_ = FALSE; #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return FALSE; -#line 4347 "GSettingsEngine.c" + return _tmp8_; +#line 4367 "GSettingsEngine.c" } else { + gboolean _tmp9_ = FALSE; #line 352 "/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 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return FALSE; -#line 4355 "GSettingsEngine.c" + return _tmp9_; +#line 4376 "GSettingsEngine.c" } } #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp0_; #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4362 "GSettingsEngine.c" +#line 4383 "GSettingsEngine.c" } @@ -4405,7 +4426,7 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration g_propagate_error (error, _inner_error_); #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4409 "GSettingsEngine.c" +#line 4430 "GSettingsEngine.c" } else { #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); @@ -4413,14 +4434,14 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration g_clear_error (&_inner_error_); #line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4417 "GSettingsEngine.c" +#line 4438 "GSettingsEngine.c" } } #line 357 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp7_ = p; #line 357 "/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 4424 "GSettingsEngine.c" +#line 4445 "GSettingsEngine.c" } @@ -4464,26 +4485,29 @@ static gdouble gsettings_configuration_engine_real_get_double_property (Configur if (G_UNLIKELY (_inner_error_ != NULL)) { #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { +#line 4489 "GSettingsEngine.c" + gdouble _tmp8_ = 0.0; #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_propagate_error (error, _inner_error_); #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0.0; -#line 4472 "GSettingsEngine.c" + return _tmp8_; +#line 4495 "GSettingsEngine.c" } else { + gdouble _tmp9_ = 0.0; #line 361 "/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 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0.0; -#line 4480 "GSettingsEngine.c" + return _tmp9_; +#line 4504 "GSettingsEngine.c" } } #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp0_; #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4487 "GSettingsEngine.c" +#line 4511 "GSettingsEngine.c" } @@ -4530,7 +4554,7 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati g_propagate_error (error, _inner_error_); #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4534 "GSettingsEngine.c" +#line 4558 "GSettingsEngine.c" } else { #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); @@ -4538,14 +4562,14 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati g_clear_error (&_inner_error_); #line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4542 "GSettingsEngine.c" +#line 4566 "GSettingsEngine.c" } } #line 366 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp7_ = p; #line 366 "/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 4549 "GSettingsEngine.c" +#line 4573 "GSettingsEngine.c" } @@ -4556,6 +4580,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; + gboolean _tmp13_ = FALSE; GError * _inner_error_ = NULL; #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4573,7 +4598,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); #line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" schema_name = _tmp2_; -#line 4577 "GSettingsEngine.c" +#line 4602 "GSettingsEngine.c" { gboolean _tmp3_ = FALSE; const gchar* _tmp4_ = NULL; @@ -4597,9 +4622,11 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati _tmp3_ = _tmp8_; #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4626 "GSettingsEngine.c" + gboolean _tmp9_ = FALSE; #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4603 "GSettingsEngine.c" +#line 4630 "GSettingsEngine.c" goto __catch205_configuration_error; } #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4609,8 +4636,8 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return FALSE; -#line 4614 "GSettingsEngine.c" + return _tmp9_; +#line 4641 "GSettingsEngine.c" } #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp3_; @@ -4618,36 +4645,36 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati _g_free0 (schema_name); #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4622 "GSettingsEngine.c" +#line 4649 "GSettingsEngine.c" } goto __finally205; __catch205_configuration_error: { GError* err = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GError* _tmp10_ = NULL; + const gchar* _tmp11_ = NULL; + gboolean _tmp12_ = FALSE; #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp9_ = err; + _tmp10_ = err; #line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10_ = _tmp9_->message; + _tmp11_ = _tmp10_->message; #line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:375: GSettingsConfigurationEngine: error: %s", _tmp10_); + g_critical ("GSettingsEngine.vala:375: GSettingsConfigurationEngine: error: %s", _tmp11_); #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp11_ = def; + _tmp12_ = def; #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp11_; + result = _tmp12_; #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4651 "GSettingsEngine.c" +#line 4678 "GSettingsEngine.c" } __finally205: #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4657,8 +4684,8 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return FALSE; -#line 4662 "GSettingsEngine.c" + return _tmp13_; +#line 4689 "GSettingsEngine.c" } @@ -4685,7 +4712,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); #line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" schema_name = _tmp2_; -#line 4689 "GSettingsEngine.c" +#line 4716 "GSettingsEngine.c" { const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -4707,7 +4734,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn if (G_UNLIKELY (_inner_error_ != NULL)) { #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4711 "GSettingsEngine.c" +#line 4738 "GSettingsEngine.c" goto __catch206_configuration_error; } #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4718,7 +4745,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn g_clear_error (&_inner_error_); #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4722 "GSettingsEngine.c" +#line 4749 "GSettingsEngine.c" } } goto __finally206; @@ -4739,7 +4766,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn g_critical ("GSettingsEngine.vala:386: GSettingsConfigurationEngine: error: %s", _tmp8_); #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 4743 "GSettingsEngine.c" +#line 4770 "GSettingsEngine.c" } __finally206: #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4752,11 +4779,11 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn g_clear_error (&_inner_error_); #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4756 "GSettingsEngine.c" +#line 4783 "GSettingsEngine.c" } #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 4760 "GSettingsEngine.c" +#line 4787 "GSettingsEngine.c" } @@ -4767,6 +4794,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; + gdouble _tmp13_ = 0.0; GError * _inner_error_ = NULL; #line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4784,7 +4812,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); #line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" schema_name = _tmp2_; -#line 4788 "GSettingsEngine.c" +#line 4816 "GSettingsEngine.c" { gdouble _tmp3_ = 0.0; const gchar* _tmp4_ = NULL; @@ -4808,9 +4836,11 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat _tmp3_ = _tmp8_; #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4840 "GSettingsEngine.c" + gdouble _tmp9_ = 0.0; #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4814 "GSettingsEngine.c" +#line 4844 "GSettingsEngine.c" goto __catch207_configuration_error; } #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4820,8 +4850,8 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0.0; -#line 4825 "GSettingsEngine.c" + return _tmp9_; +#line 4855 "GSettingsEngine.c" } #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp3_; @@ -4829,36 +4859,36 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat _g_free0 (schema_name); #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4833 "GSettingsEngine.c" +#line 4863 "GSettingsEngine.c" } goto __finally207; __catch207_configuration_error: { GError* err = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gdouble _tmp11_ = 0.0; + GError* _tmp10_ = NULL; + const gchar* _tmp11_ = NULL; + gdouble _tmp12_ = 0.0; #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp9_ = err; + _tmp10_ = err; #line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10_ = _tmp9_->message; + _tmp11_ = _tmp10_->message; #line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:396: GSettingsConfigurationEngine: error: %s", _tmp10_); + g_critical ("GSettingsEngine.vala:396: GSettingsConfigurationEngine: error: %s", _tmp11_); #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp11_ = def; + _tmp12_ = def; #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp11_; + result = _tmp12_; #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 4862 "GSettingsEngine.c" +#line 4892 "GSettingsEngine.c" } __finally207: #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4868,8 +4898,8 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0.0; -#line 4873 "GSettingsEngine.c" + return _tmp13_; +#line 4903 "GSettingsEngine.c" } @@ -4896,7 +4926,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); #line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" schema_name = _tmp2_; -#line 4900 "GSettingsEngine.c" +#line 4930 "GSettingsEngine.c" { const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -4918,7 +4948,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration if (G_UNLIKELY (_inner_error_ != NULL)) { #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4922 "GSettingsEngine.c" +#line 4952 "GSettingsEngine.c" goto __catch208_configuration_error; } #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4929,7 +4959,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration g_clear_error (&_inner_error_); #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4933 "GSettingsEngine.c" +#line 4963 "GSettingsEngine.c" } } goto __finally208; @@ -4950,7 +4980,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration g_critical ("GSettingsEngine.vala:407: GSettingsConfigurationEngine: error: %s", _tmp8_); #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 4954 "GSettingsEngine.c" +#line 4984 "GSettingsEngine.c" } __finally208: #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -4963,11 +4993,11 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration g_clear_error (&_inner_error_); #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 4967 "GSettingsEngine.c" +#line 4997 "GSettingsEngine.c" } #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 4971 "GSettingsEngine.c" +#line 5001 "GSettingsEngine.c" } @@ -4978,6 +5008,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; + gint _tmp13_ = 0; GError * _inner_error_ = NULL; #line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine); @@ -4995,7 +5026,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); #line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" schema_name = _tmp2_; -#line 4999 "GSettingsEngine.c" +#line 5030 "GSettingsEngine.c" { gint _tmp3_ = 0; const gchar* _tmp4_ = NULL; @@ -5019,9 +5050,11 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng _tmp3_ = _tmp8_; #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 5054 "GSettingsEngine.c" + gint _tmp9_ = 0; #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5025 "GSettingsEngine.c" +#line 5058 "GSettingsEngine.c" goto __catch209_configuration_error; } #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5031,8 +5064,8 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 5036 "GSettingsEngine.c" + return _tmp9_; +#line 5069 "GSettingsEngine.c" } #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp3_; @@ -5040,36 +5073,36 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng _g_free0 (schema_name); #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5044 "GSettingsEngine.c" +#line 5077 "GSettingsEngine.c" } goto __finally209; __catch209_configuration_error: { GError* err = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gint _tmp11_ = 0; + GError* _tmp10_ = NULL; + const gchar* _tmp11_ = NULL; + gint _tmp12_ = 0; #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" err = _inner_error_; #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _inner_error_ = NULL; #line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp9_ = err; + _tmp10_ = err; #line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp10_ = _tmp9_->message; + _tmp11_ = _tmp10_->message; #line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - g_critical ("GSettingsEngine.vala:417: GSettingsConfigurationEngine: error: %s", _tmp10_); + g_critical ("GSettingsEngine.vala:417: GSettingsConfigurationEngine: error: %s", _tmp11_); #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - _tmp11_ = def; + _tmp12_ = def; #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - result = _tmp11_; + result = _tmp12_; #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5073 "GSettingsEngine.c" +#line 5106 "GSettingsEngine.c" } __finally209: #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5079,8 +5112,8 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_clear_error (&_inner_error_); #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" - return 0; -#line 5084 "GSettingsEngine.c" + return _tmp13_; +#line 5117 "GSettingsEngine.c" } @@ -5107,7 +5140,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); #line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" schema_name = _tmp2_; -#line 5111 "GSettingsEngine.c" +#line 5144 "GSettingsEngine.c" { const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -5129,7 +5162,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng if (G_UNLIKELY (_inner_error_ != NULL)) { #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5133 "GSettingsEngine.c" +#line 5166 "GSettingsEngine.c" goto __catch210_configuration_error; } #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5140,7 +5173,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng g_clear_error (&_inner_error_); #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5144 "GSettingsEngine.c" +#line 5177 "GSettingsEngine.c" } } goto __finally210; @@ -5161,7 +5194,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng g_critical ("GSettingsEngine.vala:428: GSettingsConfigurationEngine: error: %s", _tmp8_); #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5165 "GSettingsEngine.c" +#line 5198 "GSettingsEngine.c" } __finally210: #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5174,11 +5207,11 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5178 "GSettingsEngine.c" +#line 5211 "GSettingsEngine.c" } #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 5182 "GSettingsEngine.c" +#line 5215 "GSettingsEngine.c" } @@ -5206,7 +5239,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); #line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" schema_name = _tmp2_; -#line 5210 "GSettingsEngine.c" +#line 5243 "GSettingsEngine.c" { gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; @@ -5233,7 +5266,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati if (G_UNLIKELY (_inner_error_ != NULL)) { #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5237 "GSettingsEngine.c" +#line 5270 "GSettingsEngine.c" goto __catch211_configuration_error; } #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5244,7 +5277,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati g_clear_error (&_inner_error_); #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 5248 "GSettingsEngine.c" +#line 5281 "GSettingsEngine.c" } #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp9_ = _tmp3_; @@ -5258,7 +5291,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati _g_free0 (schema_name); #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5262 "GSettingsEngine.c" +#line 5295 "GSettingsEngine.c" } goto __finally211; __catch211_configuration_error: @@ -5290,7 +5323,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati _g_free0 (schema_name); #line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5294 "GSettingsEngine.c" +#line 5327 "GSettingsEngine.c" } __finally211: #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5301,7 +5334,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati g_clear_error (&_inner_error_); #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return NULL; -#line 5305 "GSettingsEngine.c" +#line 5338 "GSettingsEngine.c" } @@ -5328,7 +5361,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); #line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" schema_name = _tmp2_; -#line 5332 "GSettingsEngine.c" +#line 5365 "GSettingsEngine.c" { const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -5350,7 +5383,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration if (G_UNLIKELY (_inner_error_ != NULL)) { #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5354 "GSettingsEngine.c" +#line 5387 "GSettingsEngine.c" goto __catch212_configuration_error; } #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5361,7 +5394,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration g_clear_error (&_inner_error_); #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5365 "GSettingsEngine.c" +#line 5398 "GSettingsEngine.c" } } goto __finally212; @@ -5382,7 +5415,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration g_critical ("GSettingsEngine.vala:449: GSettingsConfigurationEngine: error: %s", _tmp8_); #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5386 "GSettingsEngine.c" +#line 5419 "GSettingsEngine.c" } __finally212: #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5395,11 +5428,11 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration g_clear_error (&_inner_error_); #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5399 "GSettingsEngine.c" +#line 5432 "GSettingsEngine.c" } #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 5403 "GSettingsEngine.c" +#line 5436 "GSettingsEngine.c" } @@ -5426,7 +5459,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE _tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_); #line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" schema_name = _tmp2_; -#line 5430 "GSettingsEngine.c" +#line 5463 "GSettingsEngine.c" { const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -5445,7 +5478,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE if (G_UNLIKELY (_inner_error_ != NULL)) { #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5449 "GSettingsEngine.c" +#line 5482 "GSettingsEngine.c" goto __catch213_configuration_error; } #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5456,7 +5489,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE g_clear_error (&_inner_error_); #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5460 "GSettingsEngine.c" +#line 5493 "GSettingsEngine.c" } } goto __finally213; @@ -5477,7 +5510,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE g_critical ("GSettingsEngine.vala:459: GSettingsConfigurationEngine: error: %s", _tmp7_); #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5481 "GSettingsEngine.c" +#line 5514 "GSettingsEngine.c" } __finally213: #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5490,11 +5523,11 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE g_clear_error (&_inner_error_); #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5494 "GSettingsEngine.c" +#line 5527 "GSettingsEngine.c" } #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (schema_name); -#line 5498 "GSettingsEngine.c" +#line 5531 "GSettingsEngine.c" } @@ -5515,7 +5548,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled _tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_); #line 464 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" enable_disable_name = _tmp1_; -#line 5519 "GSettingsEngine.c" +#line 5552 "GSettingsEngine.c" { FuzzyPropertyState _tmp2_ = 0; gboolean _tmp3_ = FALSE; @@ -5528,7 +5561,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled if (G_UNLIKELY (_inner_error_ != NULL)) { #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5532 "GSettingsEngine.c" +#line 5565 "GSettingsEngine.c" goto __catch214_configuration_error; } #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5539,17 +5572,17 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled g_clear_error (&_inner_error_); #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return 0; -#line 5543 "GSettingsEngine.c" +#line 5576 "GSettingsEngine.c" } #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_tmp3_) { #line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp2_ = FUZZY_PROPERTY_STATE_ENABLED; -#line 5549 "GSettingsEngine.c" +#line 5582 "GSettingsEngine.c" } else { #line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _tmp2_ = FUZZY_PROPERTY_STATE_DISABLED; -#line 5553 "GSettingsEngine.c" +#line 5586 "GSettingsEngine.c" } #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" result = _tmp2_; @@ -5557,7 +5590,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled _g_free0 (enable_disable_name); #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5561 "GSettingsEngine.c" +#line 5594 "GSettingsEngine.c" } goto __finally214; __catch214_configuration_error: @@ -5583,7 +5616,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled _g_free0 (enable_disable_name); #line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return result; -#line 5587 "GSettingsEngine.c" +#line 5620 "GSettingsEngine.c" } __finally214: #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5594,7 +5627,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled g_clear_error (&_inner_error_); #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return 0; -#line 5598 "GSettingsEngine.c" +#line 5631 "GSettingsEngine.c" } @@ -5614,7 +5647,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio _tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_); #line 476 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" enable_disable_name = _tmp1_; -#line 5618 "GSettingsEngine.c" +#line 5651 "GSettingsEngine.c" { gboolean _tmp2_ = FALSE; #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5625,7 +5658,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio if (G_UNLIKELY (_inner_error_ != NULL)) { #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5629 "GSettingsEngine.c" +#line 5662 "GSettingsEngine.c" goto __catch215_configuration_error; } #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5636,7 +5669,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio g_clear_error (&_inner_error_); #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5640 "GSettingsEngine.c" +#line 5673 "GSettingsEngine.c" } } goto __finally215; @@ -5657,7 +5690,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio g_critical ("GSettingsEngine.vala:481: GSettingsConfigurationEngine: error: %s", _tmp4_); #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5661 "GSettingsEngine.c" +#line 5694 "GSettingsEngine.c" } __finally215: #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5670,11 +5703,11 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio g_clear_error (&_inner_error_); #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5674 "GSettingsEngine.c" +#line 5707 "GSettingsEngine.c" } #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (enable_disable_name); -#line 5678 "GSettingsEngine.c" +#line 5711 "GSettingsEngine.c" } @@ -5705,13 +5738,13 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) { _g_object_unref0 (_tmp1_); #line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" cmd_line = _tmp5_; -#line 5709 "GSettingsEngine.c" +#line 5742 "GSettingsEngine.c" { #line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" g_spawn_command_line_sync (cmd_line, NULL, NULL, NULL, &_inner_error_); #line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5715 "GSettingsEngine.c" +#line 5748 "GSettingsEngine.c" goto __catch216_g_error; } } @@ -5733,7 +5766,7 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) { g_message ("GSettingsEngine.vala:495: Error running shotwell-settings-migrator: %s", _tmp7_); #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_error_free0 (err); -#line 5737 "GSettingsEngine.c" +#line 5770 "GSettingsEngine.c" } __finally216: #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" @@ -5746,11 +5779,11 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) { g_clear_error (&_inner_error_); #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" return; -#line 5750 "GSettingsEngine.c" +#line 5783 "GSettingsEngine.c" } #line 489 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala" _g_free0 (cmd_line); -#line 5754 "GSettingsEngine.c" +#line 5787 "GSettingsEngine.c" } @@ -5761,7 +5794,7 @@ static void gsettings_configuration_engine_class_init (GSettingsConfigurationEng 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 5765 "GSettingsEngine.c" +#line 5798 "GSettingsEngine.c" } @@ -5812,14 +5845,14 @@ 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 5816 "GSettingsEngine.c" +#line 5849 "GSettingsEngine.c" } 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 5823 "GSettingsEngine.c" +#line 5856 "GSettingsEngine.c" } @@ -5833,7 +5866,7 @@ 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 5837 "GSettingsEngine.c" +#line 5870 "GSettingsEngine.c" } -- cgit v1.2.3