diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:51:46 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:51:46 +0200 |
| commit | 9e7cd144725a270e0460b21747619f447ca87684 (patch) | |
| tree | 77916a766425839c1a2466afd2eb1244371b6b9b /src/config | |
| parent | 3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff) | |
New upstream version 0.26.1upstream/0.26.1
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/Config.c | 2 | ||||
| -rw-r--r-- | src/config/ConfigurationInterfaces.c | 2348 | ||||
| -rw-r--r-- | src/config/GSettingsEngine.c | 587 |
3 files changed, 1545 insertions, 1392 deletions
diff --git a/src/config/Config.c b/src/config/Config.c index a4faeb0..8c5fc92 100644 --- a/src/config/Config.c +++ b/src/config/Config.c @@ -1,4 +1,4 @@ -/* Config.c generated by valac 0.34.4, the Vala compiler +/* Config.c generated by valac 0.34.7, the Vala compiler * generated from Config.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c index a44fd05..3b225bb 100644 --- a/src/config/ConfigurationInterfaces.c +++ b/src/config/ConfigurationInterfaces.c @@ -1,4 +1,4 @@ -/* ConfigurationInterfaces.c generated by valac 0.34.4, the Vala compiler +/* ConfigurationInterfaces.c generated by valac 0.34.7, the Vala compiler * generated from ConfigurationInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2093,6 +2093,7 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr static gboolean configuration_facade_real_get_auto_import_from_library (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -2114,9 +2115,11 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur _tmp0_ = _tmp4_; #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 2114 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2115 "ConfigurationInterfaces.c" +#line 2118 "ConfigurationInterfaces.c" goto __catch82_configuration_error; } #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2124,35 +2127,35 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 2124 "ConfigurationInterfaces.c" + return _tmp5_; +#line 2127 "ConfigurationInterfaces.c" } #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2130 "ConfigurationInterfaces.c" +#line 2133 "ConfigurationInterfaces.c" } goto __finally82; __catch82_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2151 "ConfigurationInterfaces.c" +#line 2154 "ConfigurationInterfaces.c" } __finally82: #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2160,8 +2163,8 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 2160 "ConfigurationInterfaces.c" + return _tmp7_; +#line 2163 "ConfigurationInterfaces.c" } @@ -2170,7 +2173,7 @@ gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_auto_import_from_library (self); -#line 2169 "ConfigurationInterfaces.c" +#line 2172 "ConfigurationInterfaces.c" } @@ -2194,7 +2197,7 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio if (G_UNLIKELY (_inner_error_ != NULL)) { #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2193 "ConfigurationInterfaces.c" +#line 2196 "ConfigurationInterfaces.c" goto __catch83_configuration_error; } #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2203,7 +2206,7 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2202 "ConfigurationInterfaces.c" +#line 2205 "ConfigurationInterfaces.c" } } goto __finally83; @@ -2223,7 +2226,7 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio _g_error_free0 (err); #line 429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2222 "ConfigurationInterfaces.c" +#line 2225 "ConfigurationInterfaces.c" } __finally83: #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2234,7 +2237,7 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio g_clear_error (&_inner_error_); #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2233 "ConfigurationInterfaces.c" +#line 2236 "ConfigurationInterfaces.c" } } @@ -2244,7 +2247,7 @@ void configuration_facade_set_auto_import_from_library (ConfigurationFacade* sel g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_auto_import_from_library (self, auto_import); -#line 2243 "ConfigurationInterfaces.c" +#line 2246 "ConfigurationInterfaces.c" } @@ -2274,7 +2277,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2273 "ConfigurationInterfaces.c" +#line 2276 "ConfigurationInterfaces.c" goto __catch84_configuration_error; } #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2283,7 +2286,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* g_clear_error (&_inner_error_); #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2282 "ConfigurationInterfaces.c" +#line 2285 "ConfigurationInterfaces.c" } #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -2295,7 +2298,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* _g_free0 (_tmp0_); #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2294 "ConfigurationInterfaces.c" +#line 2297 "ConfigurationInterfaces.c" } goto __finally84; __catch84_configuration_error: @@ -2319,7 +2322,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* _g_error_free0 (err); #line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2318 "ConfigurationInterfaces.c" +#line 2321 "ConfigurationInterfaces.c" } __finally84: #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2328,7 +2331,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* g_clear_error (&_inner_error_); #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2327 "ConfigurationInterfaces.c" +#line 2330 "ConfigurationInterfaces.c" } @@ -2337,7 +2340,7 @@ gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_bg_color_name (self); -#line 2336 "ConfigurationInterfaces.c" +#line 2339 "ConfigurationInterfaces.c" } @@ -2345,7 +2348,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se GError * _inner_error_ = NULL; #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (color_name != NULL); -#line 2344 "ConfigurationInterfaces.c" +#line 2347 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -2364,7 +2367,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se if (G_UNLIKELY (_inner_error_ != NULL)) { #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2363 "ConfigurationInterfaces.c" +#line 2366 "ConfigurationInterfaces.c" goto __catch85_configuration_error; } #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2373,7 +2376,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se g_clear_error (&_inner_error_); #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2372 "ConfigurationInterfaces.c" +#line 2375 "ConfigurationInterfaces.c" } } goto __finally85; @@ -2393,7 +2396,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se _g_error_free0 (err); #line 451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2392 "ConfigurationInterfaces.c" +#line 2395 "ConfigurationInterfaces.c" } __finally85: #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2404,7 +2407,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se g_clear_error (&_inner_error_); #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2403 "ConfigurationInterfaces.c" +#line 2406 "ConfigurationInterfaces.c" } } @@ -2414,12 +2417,13 @@ void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gc g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_bg_color_name (self, color_name); -#line 2413 "ConfigurationInterfaces.c" +#line 2416 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_commit_metadata_to_masters (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -2441,9 +2445,11 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config _tmp0_ = _tmp4_; #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 2444 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2442 "ConfigurationInterfaces.c" +#line 2448 "ConfigurationInterfaces.c" goto __catch86_configuration_error; } #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2451,35 +2457,35 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 2451 "ConfigurationInterfaces.c" + return _tmp5_; +#line 2457 "ConfigurationInterfaces.c" } #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2457 "ConfigurationInterfaces.c" +#line 2463 "ConfigurationInterfaces.c" } goto __finally86; __catch86_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2478 "ConfigurationInterfaces.c" +#line 2484 "ConfigurationInterfaces.c" } __finally86: #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2487,8 +2493,8 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 2487 "ConfigurationInterfaces.c" + return _tmp7_; +#line 2493 "ConfigurationInterfaces.c" } @@ -2497,7 +2503,7 @@ gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacad g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_commit_metadata_to_masters (self); -#line 2496 "ConfigurationInterfaces.c" +#line 2502 "ConfigurationInterfaces.c" } @@ -2521,7 +2527,7 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat if (G_UNLIKELY (_inner_error_ != NULL)) { #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2520 "ConfigurationInterfaces.c" +#line 2526 "ConfigurationInterfaces.c" goto __catch87_configuration_error; } #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2530,7 +2536,7 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat g_clear_error (&_inner_error_); #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2529 "ConfigurationInterfaces.c" +#line 2535 "ConfigurationInterfaces.c" } } goto __finally87; @@ -2550,7 +2556,7 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat _g_error_free0 (err); #line 474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2549 "ConfigurationInterfaces.c" +#line 2555 "ConfigurationInterfaces.c" } __finally87: #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2561,7 +2567,7 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat g_clear_error (&_inner_error_); #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2560 "ConfigurationInterfaces.c" +#line 2566 "ConfigurationInterfaces.c" } } @@ -2571,7 +2577,7 @@ void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* s g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_commit_metadata_to_masters (self, commit_metadata); -#line 2570 "ConfigurationInterfaces.c" +#line 2576 "ConfigurationInterfaces.c" } @@ -2601,7 +2607,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2600 "ConfigurationInterfaces.c" +#line 2606 "ConfigurationInterfaces.c" goto __catch88_configuration_error; } #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2610,7 +2616,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac g_clear_error (&_inner_error_); #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2609 "ConfigurationInterfaces.c" +#line 2615 "ConfigurationInterfaces.c" } #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -2622,7 +2628,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac _g_free0 (_tmp0_); #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2621 "ConfigurationInterfaces.c" +#line 2627 "ConfigurationInterfaces.c" } goto __finally88; __catch88_configuration_error: @@ -2646,7 +2652,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac _g_error_free0 (err); #line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2645 "ConfigurationInterfaces.c" +#line 2651 "ConfigurationInterfaces.c" } __finally88: #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2655,7 +2661,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac g_clear_error (&_inner_error_); #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2654 "ConfigurationInterfaces.c" +#line 2660 "ConfigurationInterfaces.c" } @@ -2664,7 +2670,7 @@ gchar* configuration_facade_get_desktop_background (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_desktop_background (self); -#line 2663 "ConfigurationInterfaces.c" +#line 2669 "ConfigurationInterfaces.c" } @@ -2672,7 +2678,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad GError * _inner_error_ = NULL; #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (filename != NULL); -#line 2671 "ConfigurationInterfaces.c" +#line 2677 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -2693,7 +2699,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad if (G_UNLIKELY (_inner_error_ != NULL)) { #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2692 "ConfigurationInterfaces.c" +#line 2698 "ConfigurationInterfaces.c" goto __catch89_configuration_error; } #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2702,7 +2708,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad g_clear_error (&_inner_error_); #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2701 "ConfigurationInterfaces.c" +#line 2707 "ConfigurationInterfaces.c" } #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_facade_get_engine (self); @@ -2716,7 +2722,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad if (G_UNLIKELY (_inner_error_ != NULL)) { #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2715 "ConfigurationInterfaces.c" +#line 2721 "ConfigurationInterfaces.c" goto __catch89_configuration_error; } #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2725,7 +2731,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad g_clear_error (&_inner_error_); #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2724 "ConfigurationInterfaces.c" +#line 2730 "ConfigurationInterfaces.c" } } goto __finally89; @@ -2743,7 +2749,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad configuration_facade_on_configuration_error (self, _tmp5_); #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 2742 "ConfigurationInterfaces.c" +#line 2748 "ConfigurationInterfaces.c" } __finally89: #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2754,7 +2760,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad g_clear_error (&_inner_error_); #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2753 "ConfigurationInterfaces.c" +#line 2759 "ConfigurationInterfaces.c" } } @@ -2764,7 +2770,7 @@ void configuration_facade_set_desktop_background (ConfigurationFacade* self, con g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_desktop_background (self, filename); -#line 2763 "ConfigurationInterfaces.c" +#line 2769 "ConfigurationInterfaces.c" } @@ -2794,7 +2800,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se if (G_UNLIKELY (_inner_error_ != NULL)) { #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2793 "ConfigurationInterfaces.c" +#line 2799 "ConfigurationInterfaces.c" goto __catch90_configuration_error; } #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2803,7 +2809,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se g_clear_error (&_inner_error_); #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2802 "ConfigurationInterfaces.c" +#line 2808 "ConfigurationInterfaces.c" } #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -2815,7 +2821,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se _g_free0 (_tmp0_); #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2814 "ConfigurationInterfaces.c" +#line 2820 "ConfigurationInterfaces.c" } goto __finally90; __catch90_configuration_error: @@ -2839,7 +2845,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se _g_error_free0 (err); #line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 2838 "ConfigurationInterfaces.c" +#line 2844 "ConfigurationInterfaces.c" } __finally90: #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2848,7 +2854,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se g_clear_error (&_inner_error_); #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2847 "ConfigurationInterfaces.c" +#line 2853 "ConfigurationInterfaces.c" } @@ -2857,7 +2863,7 @@ gchar* configuration_facade_get_screensaver (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_screensaver (self); -#line 2856 "ConfigurationInterfaces.c" +#line 2862 "ConfigurationInterfaces.c" } @@ -2865,7 +2871,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self GError * _inner_error_ = NULL; #line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (filename != NULL); -#line 2864 "ConfigurationInterfaces.c" +#line 2870 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -2886,7 +2892,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self if (G_UNLIKELY (_inner_error_ != NULL)) { #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2885 "ConfigurationInterfaces.c" +#line 2891 "ConfigurationInterfaces.c" goto __catch91_configuration_error; } #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2895,7 +2901,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self g_clear_error (&_inner_error_); #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2894 "ConfigurationInterfaces.c" +#line 2900 "ConfigurationInterfaces.c" } #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_facade_get_engine (self); @@ -2909,7 +2915,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self if (G_UNLIKELY (_inner_error_ != NULL)) { #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2908 "ConfigurationInterfaces.c" +#line 2914 "ConfigurationInterfaces.c" goto __catch91_configuration_error; } #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2918,7 +2924,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self g_clear_error (&_inner_error_); #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2917 "ConfigurationInterfaces.c" +#line 2923 "ConfigurationInterfaces.c" } } goto __finally91; @@ -2936,7 +2942,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self configuration_facade_on_configuration_error (self, _tmp5_); #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 2935 "ConfigurationInterfaces.c" +#line 2941 "ConfigurationInterfaces.c" } __finally91: #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2947,7 +2953,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self g_clear_error (&_inner_error_); #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 2946 "ConfigurationInterfaces.c" +#line 2952 "ConfigurationInterfaces.c" } } @@ -2957,7 +2963,7 @@ void configuration_facade_set_screensaver (ConfigurationFacade* self, const gcha g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_screensaver (self, filename); -#line 2956 "ConfigurationInterfaces.c" +#line 2962 "ConfigurationInterfaces.c" } @@ -2988,7 +2994,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 2987 "ConfigurationInterfaces.c" +#line 2993 "ConfigurationInterfaces.c" goto __catch92_configuration_error; } #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -2997,17 +3003,17 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca g_clear_error (&_inner_error_); #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 2996 "ConfigurationInterfaces.c" +#line 3002 "ConfigurationInterfaces.c" } #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (g_strcmp0 (s, "") == 0) { #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp4_ = NULL; -#line 3002 "ConfigurationInterfaces.c" +#line 3008 "ConfigurationInterfaces.c" } else { #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp4_ = s; -#line 3006 "ConfigurationInterfaces.c" +#line 3012 "ConfigurationInterfaces.c" } #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = g_strdup (_tmp4_); @@ -3017,7 +3023,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca _g_free0 (s); #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3016 "ConfigurationInterfaces.c" +#line 3022 "ConfigurationInterfaces.c" } goto __finally92; __catch92_configuration_error: @@ -3041,7 +3047,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca _g_error_free0 (err); #line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3040 "ConfigurationInterfaces.c" +#line 3046 "ConfigurationInterfaces.c" } __finally92: #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3050,7 +3056,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca g_clear_error (&_inner_error_); #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3049 "ConfigurationInterfaces.c" +#line 3055 "ConfigurationInterfaces.c" } @@ -3059,7 +3065,7 @@ gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern (self); -#line 3058 "ConfigurationInterfaces.c" +#line 3064 "ConfigurationInterfaces.c" } @@ -3076,7 +3082,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade if (_tmp0_ == NULL) { #line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" s = ""; -#line 3075 "ConfigurationInterfaces.c" +#line 3081 "ConfigurationInterfaces.c" } #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); @@ -3092,7 +3098,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade if (G_UNLIKELY (_inner_error_ != NULL)) { #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3091 "ConfigurationInterfaces.c" +#line 3097 "ConfigurationInterfaces.c" goto __catch93_configuration_error; } #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3101,7 +3107,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade g_clear_error (&_inner_error_); #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3100 "ConfigurationInterfaces.c" +#line 3106 "ConfigurationInterfaces.c" } } goto __finally93; @@ -3119,7 +3125,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade configuration_facade_on_configuration_error (self, _tmp4_); #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3118 "ConfigurationInterfaces.c" +#line 3124 "ConfigurationInterfaces.c" } __finally93: #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3130,7 +3136,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade g_clear_error (&_inner_error_); #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3129 "ConfigurationInterfaces.c" +#line 3135 "ConfigurationInterfaces.c" } } @@ -3140,7 +3146,7 @@ void configuration_facade_set_directory_pattern (ConfigurationFacade* self, cons g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern (self, s); -#line 3139 "ConfigurationInterfaces.c" +#line 3145 "ConfigurationInterfaces.c" } @@ -3170,7 +3176,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat if (G_UNLIKELY (_inner_error_ != NULL)) { #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3169 "ConfigurationInterfaces.c" +#line 3175 "ConfigurationInterfaces.c" goto __catch94_configuration_error; } #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3179,7 +3185,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat g_clear_error (&_inner_error_); #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3178 "ConfigurationInterfaces.c" +#line 3184 "ConfigurationInterfaces.c" } #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -3191,7 +3197,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat _g_free0 (_tmp0_); #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3190 "ConfigurationInterfaces.c" +#line 3196 "ConfigurationInterfaces.c" } goto __finally94; __catch94_configuration_error: @@ -3215,7 +3221,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat _g_error_free0 (err); #line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3214 "ConfigurationInterfaces.c" +#line 3220 "ConfigurationInterfaces.c" } __finally94: #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3224,7 +3230,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat g_clear_error (&_inner_error_); #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 3223 "ConfigurationInterfaces.c" +#line 3229 "ConfigurationInterfaces.c" } @@ -3233,7 +3239,7 @@ gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* s g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern_custom (self); -#line 3232 "ConfigurationInterfaces.c" +#line 3238 "ConfigurationInterfaces.c" } @@ -3241,7 +3247,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio GError * _inner_error_ = NULL; #line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (s != NULL); -#line 3240 "ConfigurationInterfaces.c" +#line 3246 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -3260,7 +3266,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio if (G_UNLIKELY (_inner_error_ != NULL)) { #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3259 "ConfigurationInterfaces.c" +#line 3265 "ConfigurationInterfaces.c" goto __catch95_configuration_error; } #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3269,7 +3275,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio g_clear_error (&_inner_error_); #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3268 "ConfigurationInterfaces.c" +#line 3274 "ConfigurationInterfaces.c" } } goto __finally95; @@ -3287,7 +3293,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio configuration_facade_on_configuration_error (self, _tmp3_); #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3286 "ConfigurationInterfaces.c" +#line 3292 "ConfigurationInterfaces.c" } __finally95: #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3298,7 +3304,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio g_clear_error (&_inner_error_); #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3297 "ConfigurationInterfaces.c" +#line 3303 "ConfigurationInterfaces.c" } } @@ -3308,7 +3314,7 @@ void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* sel g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern_custom (self, s); -#line 3307 "ConfigurationInterfaces.c" +#line 3313 "ConfigurationInterfaces.c" } @@ -3320,7 +3326,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca _vala_maximize = FALSE; #line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" dimensions_init (&_vala_dimensions, 1024, 768); -#line 3319 "ConfigurationInterfaces.c" +#line 3325 "ConfigurationInterfaces.c" { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_ = NULL; @@ -3355,7 +3361,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3354 "ConfigurationInterfaces.c" +#line 3360 "ConfigurationInterfaces.c" goto __catch96_configuration_error; } #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3364,7 +3370,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3363 "ConfigurationInterfaces.c" +#line 3369 "ConfigurationInterfaces.c" } #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_maximize = _tmp0_; @@ -3384,7 +3390,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3383 "ConfigurationInterfaces.c" +#line 3389 "ConfigurationInterfaces.c" goto __catch96_configuration_error; } #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3393,7 +3399,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3392 "ConfigurationInterfaces.c" +#line 3398 "ConfigurationInterfaces.c" } #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp9_ = configuration_facade_get_engine (self); @@ -3411,7 +3417,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3410 "ConfigurationInterfaces.c" +#line 3416 "ConfigurationInterfaces.c" goto __catch96_configuration_error; } #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3420,7 +3426,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3419 "ConfigurationInterfaces.c" +#line 3425 "ConfigurationInterfaces.c" } #line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp13_ = w; @@ -3428,7 +3434,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca _tmp14_ = h; #line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_); -#line 3427 "ConfigurationInterfaces.c" +#line 3433 "ConfigurationInterfaces.c" } goto __finally96; __catch96_configuration_error: @@ -3445,7 +3451,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca configuration_facade_on_configuration_error (self, _tmp15_); #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3444 "ConfigurationInterfaces.c" +#line 3450 "ConfigurationInterfaces.c" } __finally96: #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3456,19 +3462,19 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3455 "ConfigurationInterfaces.c" +#line 3461 "ConfigurationInterfaces.c" } #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (maximize) { #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *maximize = _vala_maximize; -#line 3461 "ConfigurationInterfaces.c" +#line 3467 "ConfigurationInterfaces.c" } #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (dimensions) { #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *dimensions = _vala_dimensions; -#line 3467 "ConfigurationInterfaces.c" +#line 3473 "ConfigurationInterfaces.c" } } @@ -3478,7 +3484,7 @@ void configuration_facade_get_direct_window_state (ConfigurationFacade* self, gb g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->get_direct_window_state (self, maximize, dimensions); -#line 3477 "ConfigurationInterfaces.c" +#line 3483 "ConfigurationInterfaces.c" } @@ -3486,7 +3492,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca GError * _inner_error_ = NULL; #line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (dimensions != NULL); -#line 3485 "ConfigurationInterfaces.c" +#line 3491 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -3513,7 +3519,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3512 "ConfigurationInterfaces.c" +#line 3518 "ConfigurationInterfaces.c" goto __catch97_configuration_error; } #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3522,7 +3528,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3521 "ConfigurationInterfaces.c" +#line 3527 "ConfigurationInterfaces.c" } #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_facade_get_engine (self); @@ -3540,7 +3546,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3539 "ConfigurationInterfaces.c" +#line 3545 "ConfigurationInterfaces.c" goto __catch97_configuration_error; } #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3549,7 +3555,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3548 "ConfigurationInterfaces.c" +#line 3554 "ConfigurationInterfaces.c" } #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp7_ = configuration_facade_get_engine (self); @@ -3567,7 +3573,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3566 "ConfigurationInterfaces.c" +#line 3572 "ConfigurationInterfaces.c" goto __catch97_configuration_error; } #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3576,7 +3582,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3575 "ConfigurationInterfaces.c" +#line 3581 "ConfigurationInterfaces.c" } } goto __finally97; @@ -3594,7 +3600,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca configuration_facade_on_configuration_error (self, _tmp11_); #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3593 "ConfigurationInterfaces.c" +#line 3599 "ConfigurationInterfaces.c" } __finally97: #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3605,7 +3611,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca g_clear_error (&_inner_error_); #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3604 "ConfigurationInterfaces.c" +#line 3610 "ConfigurationInterfaces.c" } } @@ -3615,12 +3621,13 @@ void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gb g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_direct_window_state (self, maximize, dimensions); -#line 3614 "ConfigurationInterfaces.c" +#line 3620 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_basic_properties (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -3642,9 +3649,11 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur _tmp0_ = _tmp4_; #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 3648 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3643 "ConfigurationInterfaces.c" +#line 3652 "ConfigurationInterfaces.c" goto __catch98_configuration_error; } #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3652,35 +3661,35 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 3652 "ConfigurationInterfaces.c" + return _tmp5_; +#line 3661 "ConfigurationInterfaces.c" } #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3658 "ConfigurationInterfaces.c" +#line 3667 "ConfigurationInterfaces.c" } goto __finally98; __catch98_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3679 "ConfigurationInterfaces.c" +#line 3688 "ConfigurationInterfaces.c" } __finally98: #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3688,8 +3697,8 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 3688 "ConfigurationInterfaces.c" + return _tmp7_; +#line 3697 "ConfigurationInterfaces.c" } @@ -3698,7 +3707,7 @@ gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_basic_properties (self); -#line 3697 "ConfigurationInterfaces.c" +#line 3706 "ConfigurationInterfaces.c" } @@ -3722,7 +3731,7 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio if (G_UNLIKELY (_inner_error_ != NULL)) { #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3721 "ConfigurationInterfaces.c" +#line 3730 "ConfigurationInterfaces.c" goto __catch99_configuration_error; } #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3731,7 +3740,7 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio g_clear_error (&_inner_error_); #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3730 "ConfigurationInterfaces.c" +#line 3739 "ConfigurationInterfaces.c" } } goto __finally99; @@ -3749,7 +3758,7 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio configuration_facade_on_configuration_error (self, _tmp3_); #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3748 "ConfigurationInterfaces.c" +#line 3757 "ConfigurationInterfaces.c" } __finally99: #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3760,7 +3769,7 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio g_clear_error (&_inner_error_); #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3759 "ConfigurationInterfaces.c" +#line 3768 "ConfigurationInterfaces.c" } } @@ -3770,12 +3779,13 @@ void configuration_facade_set_display_basic_properties (ConfigurationFacade* sel g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_basic_properties (self, display); -#line 3769 "ConfigurationInterfaces.c" +#line 3778 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_extended_properties (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -3797,9 +3807,11 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi _tmp0_ = _tmp4_; #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 3806 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3798 "ConfigurationInterfaces.c" +#line 3810 "ConfigurationInterfaces.c" goto __catch100_configuration_error; } #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3807,35 +3819,35 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 3807 "ConfigurationInterfaces.c" + return _tmp5_; +#line 3819 "ConfigurationInterfaces.c" } #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3813 "ConfigurationInterfaces.c" +#line 3825 "ConfigurationInterfaces.c" } goto __finally100; __catch100_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3834 "ConfigurationInterfaces.c" +#line 3846 "ConfigurationInterfaces.c" } __finally100: #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3843,8 +3855,8 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 3843 "ConfigurationInterfaces.c" + return _tmp7_; +#line 3855 "ConfigurationInterfaces.c" } @@ -3853,7 +3865,7 @@ gboolean configuration_facade_get_display_extended_properties (ConfigurationFaca g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_extended_properties (self); -#line 3852 "ConfigurationInterfaces.c" +#line 3864 "ConfigurationInterfaces.c" } @@ -3877,7 +3889,7 @@ static void configuration_facade_real_set_display_extended_properties (Configura if (G_UNLIKELY (_inner_error_ != NULL)) { #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3876 "ConfigurationInterfaces.c" +#line 3888 "ConfigurationInterfaces.c" goto __catch101_configuration_error; } #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3886,7 +3898,7 @@ static void configuration_facade_real_set_display_extended_properties (Configura g_clear_error (&_inner_error_); #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3885 "ConfigurationInterfaces.c" +#line 3897 "ConfigurationInterfaces.c" } } goto __finally101; @@ -3904,7 +3916,7 @@ static void configuration_facade_real_set_display_extended_properties (Configura configuration_facade_on_configuration_error (self, _tmp3_); #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 3903 "ConfigurationInterfaces.c" +#line 3915 "ConfigurationInterfaces.c" } __finally101: #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3915,7 +3927,7 @@ static void configuration_facade_real_set_display_extended_properties (Configura g_clear_error (&_inner_error_); #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 3914 "ConfigurationInterfaces.c" +#line 3926 "ConfigurationInterfaces.c" } } @@ -3925,12 +3937,13 @@ void configuration_facade_set_display_extended_properties (ConfigurationFacade* g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_extended_properties (self, display); -#line 3924 "ConfigurationInterfaces.c" +#line 3936 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -3952,9 +3965,11 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca _tmp0_ = _tmp4_; #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 3964 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 3953 "ConfigurationInterfaces.c" +#line 3968 "ConfigurationInterfaces.c" goto __catch102_configuration_error; } #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3962,35 +3977,35 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 3962 "ConfigurationInterfaces.c" + return _tmp5_; +#line 3977 "ConfigurationInterfaces.c" } #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3968 "ConfigurationInterfaces.c" +#line 3983 "ConfigurationInterfaces.c" } goto __finally102; __catch102_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 3989 "ConfigurationInterfaces.c" +#line 4004 "ConfigurationInterfaces.c" } __finally102: #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -3998,8 +4013,8 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 3998 "ConfigurationInterfaces.c" + return _tmp7_; +#line 4013 "ConfigurationInterfaces.c" } @@ -4008,7 +4023,7 @@ gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_sidebar (self); -#line 4007 "ConfigurationInterfaces.c" +#line 4022 "ConfigurationInterfaces.c" } @@ -4032,7 +4047,7 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4031 "ConfigurationInterfaces.c" +#line 4046 "ConfigurationInterfaces.c" goto __catch103_configuration_error; } #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4041,7 +4056,7 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* g_clear_error (&_inner_error_); #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4040 "ConfigurationInterfaces.c" +#line 4055 "ConfigurationInterfaces.c" } } goto __finally103; @@ -4059,7 +4074,7 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* configuration_facade_on_configuration_error (self, _tmp3_); #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4058 "ConfigurationInterfaces.c" +#line 4073 "ConfigurationInterfaces.c" } __finally103: #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4070,7 +4085,7 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade* g_clear_error (&_inner_error_); #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4069 "ConfigurationInterfaces.c" +#line 4084 "ConfigurationInterfaces.c" } } @@ -4080,12 +4095,13 @@ void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboole g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_sidebar (self, display); -#line 4079 "ConfigurationInterfaces.c" +#line 4094 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -4107,9 +4123,11 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca _tmp0_ = _tmp4_; #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4122 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4108 "ConfigurationInterfaces.c" +#line 4126 "ConfigurationInterfaces.c" goto __catch104_configuration_error; } #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4117,35 +4135,35 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4117 "ConfigurationInterfaces.c" + return _tmp5_; +#line 4135 "ConfigurationInterfaces.c" } #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4123 "ConfigurationInterfaces.c" +#line 4141 "ConfigurationInterfaces.c" } goto __finally104; __catch104_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4144 "ConfigurationInterfaces.c" +#line 4162 "ConfigurationInterfaces.c" } __finally104: #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4153,8 +4171,8 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4153 "ConfigurationInterfaces.c" + return _tmp7_; +#line 4171 "ConfigurationInterfaces.c" } @@ -4163,7 +4181,7 @@ gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_toolbar (self); -#line 4162 "ConfigurationInterfaces.c" +#line 4180 "ConfigurationInterfaces.c" } @@ -4187,7 +4205,7 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4186 "ConfigurationInterfaces.c" +#line 4204 "ConfigurationInterfaces.c" goto __catch105_configuration_error; } #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4196,7 +4214,7 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* g_clear_error (&_inner_error_); #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4195 "ConfigurationInterfaces.c" +#line 4213 "ConfigurationInterfaces.c" } } goto __finally105; @@ -4214,7 +4232,7 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* configuration_facade_on_configuration_error (self, _tmp3_); #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4213 "ConfigurationInterfaces.c" +#line 4231 "ConfigurationInterfaces.c" } __finally105: #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4225,7 +4243,7 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade* g_clear_error (&_inner_error_); #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4224 "ConfigurationInterfaces.c" +#line 4242 "ConfigurationInterfaces.c" } } @@ -4235,12 +4253,13 @@ void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboole g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 678 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_toolbar (self, display); -#line 4234 "ConfigurationInterfaces.c" +#line 4252 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_search_bar (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -4262,9 +4281,11 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF _tmp0_ = _tmp4_; #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4280 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4263 "ConfigurationInterfaces.c" +#line 4284 "ConfigurationInterfaces.c" goto __catch106_configuration_error; } #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4272,35 +4293,35 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4272 "ConfigurationInterfaces.c" + return _tmp5_; +#line 4293 "ConfigurationInterfaces.c" } #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4278 "ConfigurationInterfaces.c" +#line 4299 "ConfigurationInterfaces.c" } goto __finally106; __catch106_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4299 "ConfigurationInterfaces.c" +#line 4320 "ConfigurationInterfaces.c" } __finally106: #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4308,8 +4329,8 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4308 "ConfigurationInterfaces.c" + return _tmp7_; +#line 4329 "ConfigurationInterfaces.c" } @@ -4318,7 +4339,7 @@ gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self) g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_search_bar (self); -#line 4317 "ConfigurationInterfaces.c" +#line 4338 "ConfigurationInterfaces.c" } @@ -4342,7 +4363,7 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad if (G_UNLIKELY (_inner_error_ != NULL)) { #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4341 "ConfigurationInterfaces.c" +#line 4362 "ConfigurationInterfaces.c" goto __catch107_configuration_error; } #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4351,7 +4372,7 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad g_clear_error (&_inner_error_); #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4350 "ConfigurationInterfaces.c" +#line 4371 "ConfigurationInterfaces.c" } } goto __finally107; @@ -4369,7 +4390,7 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad configuration_facade_on_configuration_error (self, _tmp3_); #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4368 "ConfigurationInterfaces.c" +#line 4389 "ConfigurationInterfaces.c" } __finally107: #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4380,7 +4401,7 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad g_clear_error (&_inner_error_); #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4379 "ConfigurationInterfaces.c" +#line 4400 "ConfigurationInterfaces.c" } } @@ -4390,12 +4411,13 @@ void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gbo g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 699 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_search_bar (self, display); -#line 4389 "ConfigurationInterfaces.c" +#line 4410 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_photo_ratings (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -4417,9 +4439,11 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati _tmp0_ = _tmp4_; #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4438 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4418 "ConfigurationInterfaces.c" +#line 4442 "ConfigurationInterfaces.c" goto __catch108_configuration_error; } #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4427,35 +4451,35 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4427 "ConfigurationInterfaces.c" + return _tmp5_; +#line 4451 "ConfigurationInterfaces.c" } #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4433 "ConfigurationInterfaces.c" +#line 4457 "ConfigurationInterfaces.c" } goto __finally108; __catch108_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4454 "ConfigurationInterfaces.c" +#line 4478 "ConfigurationInterfaces.c" } __finally108: #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4463,8 +4487,8 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4463 "ConfigurationInterfaces.c" + return _tmp7_; +#line 4487 "ConfigurationInterfaces.c" } @@ -4473,7 +4497,7 @@ gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* se g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_ratings (self); -#line 4472 "ConfigurationInterfaces.c" +#line 4496 "ConfigurationInterfaces.c" } @@ -4497,7 +4521,7 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4496 "ConfigurationInterfaces.c" +#line 4520 "ConfigurationInterfaces.c" goto __catch109_configuration_error; } #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4506,7 +4530,7 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa g_clear_error (&_inner_error_); #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4505 "ConfigurationInterfaces.c" +#line 4529 "ConfigurationInterfaces.c" } } goto __finally109; @@ -4524,7 +4548,7 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa configuration_facade_on_configuration_error (self, _tmp3_); #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4523 "ConfigurationInterfaces.c" +#line 4547 "ConfigurationInterfaces.c" } __finally109: #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4535,7 +4559,7 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa g_clear_error (&_inner_error_); #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4534 "ConfigurationInterfaces.c" +#line 4558 "ConfigurationInterfaces.c" } } @@ -4545,12 +4569,13 @@ void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_ratings (self, display); -#line 4544 "ConfigurationInterfaces.c" +#line 4568 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -4572,9 +4597,11 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF _tmp0_ = _tmp4_; #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4596 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4573 "ConfigurationInterfaces.c" +#line 4600 "ConfigurationInterfaces.c" goto __catch110_configuration_error; } #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4582,35 +4609,35 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4582 "ConfigurationInterfaces.c" + return _tmp5_; +#line 4609 "ConfigurationInterfaces.c" } #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4588 "ConfigurationInterfaces.c" +#line 4615 "ConfigurationInterfaces.c" } goto __finally110; __catch110_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4609 "ConfigurationInterfaces.c" +#line 4636 "ConfigurationInterfaces.c" } __finally110: #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4618,8 +4645,8 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4618 "ConfigurationInterfaces.c" + return _tmp7_; +#line 4645 "ConfigurationInterfaces.c" } @@ -4628,7 +4655,7 @@ gboolean configuration_facade_get_display_photo_tags (ConfigurationFacade* self) g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_tags (self); -#line 4627 "ConfigurationInterfaces.c" +#line 4654 "ConfigurationInterfaces.c" } @@ -4652,7 +4679,7 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad if (G_UNLIKELY (_inner_error_ != NULL)) { #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4651 "ConfigurationInterfaces.c" +#line 4678 "ConfigurationInterfaces.c" goto __catch111_configuration_error; } #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4661,7 +4688,7 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad g_clear_error (&_inner_error_); #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4660 "ConfigurationInterfaces.c" +#line 4687 "ConfigurationInterfaces.c" } } goto __finally111; @@ -4679,7 +4706,7 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad configuration_facade_on_configuration_error (self, _tmp3_); #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4678 "ConfigurationInterfaces.c" +#line 4705 "ConfigurationInterfaces.c" } __finally111: #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4690,7 +4717,7 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad g_clear_error (&_inner_error_); #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4689 "ConfigurationInterfaces.c" +#line 4716 "ConfigurationInterfaces.c" } } @@ -4700,12 +4727,13 @@ void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gbo g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_tags (self, display); -#line 4699 "ConfigurationInterfaces.c" +#line 4726 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_photo_titles (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -4727,9 +4755,11 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio _tmp0_ = _tmp4_; #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4754 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4728 "ConfigurationInterfaces.c" +#line 4758 "ConfigurationInterfaces.c" goto __catch112_configuration_error; } #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4737,35 +4767,35 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4737 "ConfigurationInterfaces.c" + return _tmp5_; +#line 4767 "ConfigurationInterfaces.c" } #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4743 "ConfigurationInterfaces.c" +#line 4773 "ConfigurationInterfaces.c" } goto __finally112; __catch112_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4764 "ConfigurationInterfaces.c" +#line 4794 "ConfigurationInterfaces.c" } __finally112: #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4773,8 +4803,8 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4773 "ConfigurationInterfaces.c" + return _tmp7_; +#line 4803 "ConfigurationInterfaces.c" } @@ -4783,7 +4813,7 @@ gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* sel g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_titles (self); -#line 4782 "ConfigurationInterfaces.c" +#line 4812 "ConfigurationInterfaces.c" } @@ -4807,7 +4837,7 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4806 "ConfigurationInterfaces.c" +#line 4836 "ConfigurationInterfaces.c" goto __catch113_configuration_error; } #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4816,7 +4846,7 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac g_clear_error (&_inner_error_); #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4815 "ConfigurationInterfaces.c" +#line 4845 "ConfigurationInterfaces.c" } } goto __finally113; @@ -4834,7 +4864,7 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac configuration_facade_on_configuration_error (self, _tmp3_); #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4833 "ConfigurationInterfaces.c" +#line 4863 "ConfigurationInterfaces.c" } __finally113: #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4845,7 +4875,7 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac g_clear_error (&_inner_error_); #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4844 "ConfigurationInterfaces.c" +#line 4874 "ConfigurationInterfaces.c" } } @@ -4855,12 +4885,13 @@ void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, g g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_titles (self, display); -#line 4854 "ConfigurationInterfaces.c" +#line 4884 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_photo_comments (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -4882,9 +4913,11 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat _tmp0_ = _tmp4_; #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4912 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4883 "ConfigurationInterfaces.c" +#line 4916 "ConfigurationInterfaces.c" goto __catch114_configuration_error; } #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4892,35 +4925,35 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4892 "ConfigurationInterfaces.c" + return _tmp5_; +#line 4925 "ConfigurationInterfaces.c" } #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4898 "ConfigurationInterfaces.c" +#line 4931 "ConfigurationInterfaces.c" } goto __finally114; __catch114_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 4919 "ConfigurationInterfaces.c" +#line 4952 "ConfigurationInterfaces.c" } __finally114: #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4928,8 +4961,8 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 4928 "ConfigurationInterfaces.c" + return _tmp7_; +#line 4961 "ConfigurationInterfaces.c" } @@ -4938,7 +4971,7 @@ gboolean configuration_facade_get_display_photo_comments (ConfigurationFacade* s g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_comments (self); -#line 4937 "ConfigurationInterfaces.c" +#line 4970 "ConfigurationInterfaces.c" } @@ -4962,7 +4995,7 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF if (G_UNLIKELY (_inner_error_ != NULL)) { #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 4961 "ConfigurationInterfaces.c" +#line 4994 "ConfigurationInterfaces.c" goto __catch115_configuration_error; } #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -4971,7 +5004,7 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF g_clear_error (&_inner_error_); #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4970 "ConfigurationInterfaces.c" +#line 5003 "ConfigurationInterfaces.c" } } goto __finally115; @@ -4989,7 +5022,7 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF configuration_facade_on_configuration_error (self, _tmp3_); #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 4988 "ConfigurationInterfaces.c" +#line 5021 "ConfigurationInterfaces.c" } __finally115: #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5000,7 +5033,7 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF g_clear_error (&_inner_error_); #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 4999 "ConfigurationInterfaces.c" +#line 5032 "ConfigurationInterfaces.c" } } @@ -5010,12 +5043,13 @@ void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_comments (self, display); -#line 5009 "ConfigurationInterfaces.c" +#line 5042 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_display_event_comments (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -5037,9 +5071,11 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat _tmp0_ = _tmp4_; #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 5070 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5038 "ConfigurationInterfaces.c" +#line 5074 "ConfigurationInterfaces.c" goto __catch116_configuration_error; } #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5047,35 +5083,35 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 5047 "ConfigurationInterfaces.c" + return _tmp5_; +#line 5083 "ConfigurationInterfaces.c" } #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5053 "ConfigurationInterfaces.c" +#line 5089 "ConfigurationInterfaces.c" } goto __finally116; __catch116_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5074 "ConfigurationInterfaces.c" +#line 5110 "ConfigurationInterfaces.c" } __finally116: #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5083,8 +5119,8 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 5083 "ConfigurationInterfaces.c" + return _tmp7_; +#line 5119 "ConfigurationInterfaces.c" } @@ -5093,7 +5129,7 @@ gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* s g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_event_comments (self); -#line 5092 "ConfigurationInterfaces.c" +#line 5128 "ConfigurationInterfaces.c" } @@ -5117,7 +5153,7 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF if (G_UNLIKELY (_inner_error_ != NULL)) { #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5116 "ConfigurationInterfaces.c" +#line 5152 "ConfigurationInterfaces.c" goto __catch117_configuration_error; } #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5126,7 +5162,7 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF g_clear_error (&_inner_error_); #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5125 "ConfigurationInterfaces.c" +#line 5161 "ConfigurationInterfaces.c" } } goto __finally117; @@ -5144,7 +5180,7 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF configuration_facade_on_configuration_error (self, _tmp3_); #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 5143 "ConfigurationInterfaces.c" +#line 5179 "ConfigurationInterfaces.c" } __finally117: #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5155,7 +5191,7 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF g_clear_error (&_inner_error_); #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5154 "ConfigurationInterfaces.c" +#line 5190 "ConfigurationInterfaces.c" } } @@ -5165,7 +5201,7 @@ void configuration_facade_set_display_event_comments (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_display_event_comments (self, display); -#line 5164 "ConfigurationInterfaces.c" +#line 5200 "ConfigurationInterfaces.c" } @@ -5177,7 +5213,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade _vala_sort_order = FALSE; #line 817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_by = 2; -#line 5176 "ConfigurationInterfaces.c" +#line 5212 "ConfigurationInterfaces.c" { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_ = NULL; @@ -5205,7 +5241,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade if (G_UNLIKELY (_inner_error_ != NULL)) { #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5204 "ConfigurationInterfaces.c" +#line 5240 "ConfigurationInterfaces.c" goto __catch118_configuration_error; } #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5214,7 +5250,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5213 "ConfigurationInterfaces.c" +#line 5249 "ConfigurationInterfaces.c" } #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_order = _tmp0_; @@ -5234,7 +5270,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade if (G_UNLIKELY (_inner_error_ != NULL)) { #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5233 "ConfigurationInterfaces.c" +#line 5269 "ConfigurationInterfaces.c" goto __catch118_configuration_error; } #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5243,11 +5279,11 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5242 "ConfigurationInterfaces.c" +#line 5278 "ConfigurationInterfaces.c" } #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_by = _tmp5_; -#line 5246 "ConfigurationInterfaces.c" +#line 5282 "ConfigurationInterfaces.c" } goto __finally118; __catch118_configuration_error: @@ -5264,7 +5300,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade configuration_facade_on_configuration_error (self, _tmp10_); #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 5263 "ConfigurationInterfaces.c" +#line 5299 "ConfigurationInterfaces.c" } __finally118: #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5275,19 +5311,19 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5274 "ConfigurationInterfaces.c" +#line 5310 "ConfigurationInterfaces.c" } #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (sort_order) { #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *sort_order = _vala_sort_order; -#line 5280 "ConfigurationInterfaces.c" +#line 5316 "ConfigurationInterfaces.c" } #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (sort_by) { #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *sort_by = _vala_sort_by; -#line 5286 "ConfigurationInterfaces.c" +#line 5322 "ConfigurationInterfaces.c" } } @@ -5297,7 +5333,7 @@ void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboo g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->get_event_photos_sort (self, sort_order, sort_by); -#line 5296 "ConfigurationInterfaces.c" +#line 5332 "ConfigurationInterfaces.c" } @@ -5324,7 +5360,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade if (G_UNLIKELY (_inner_error_ != NULL)) { #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5323 "ConfigurationInterfaces.c" +#line 5359 "ConfigurationInterfaces.c" goto __catch119_configuration_error; } #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5333,7 +5369,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5332 "ConfigurationInterfaces.c" +#line 5368 "ConfigurationInterfaces.c" } #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_facade_get_engine (self); @@ -5349,7 +5385,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade if (G_UNLIKELY (_inner_error_ != NULL)) { #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5348 "ConfigurationInterfaces.c" +#line 5384 "ConfigurationInterfaces.c" goto __catch119_configuration_error; } #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5358,7 +5394,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5357 "ConfigurationInterfaces.c" +#line 5393 "ConfigurationInterfaces.c" } } goto __finally119; @@ -5376,7 +5412,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade configuration_facade_on_configuration_error (self, _tmp6_); #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 5375 "ConfigurationInterfaces.c" +#line 5411 "ConfigurationInterfaces.c" } __finally119: #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5387,7 +5423,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade g_clear_error (&_inner_error_); #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5386 "ConfigurationInterfaces.c" +#line 5422 "ConfigurationInterfaces.c" } } @@ -5397,12 +5433,13 @@ void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboo g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 827 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_event_photos_sort (self, sort_order, sort_by); -#line 5396 "ConfigurationInterfaces.c" +#line 5432 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_events_sort_ascending (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -5424,9 +5461,11 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati _tmp0_ = _tmp4_; #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 5460 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5425 "ConfigurationInterfaces.c" +#line 5464 "ConfigurationInterfaces.c" goto __catch120_configuration_error; } #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5434,35 +5473,35 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 5434 "ConfigurationInterfaces.c" + return _tmp5_; +#line 5473 "ConfigurationInterfaces.c" } #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5440 "ConfigurationInterfaces.c" +#line 5479 "ConfigurationInterfaces.c" } goto __finally120; __catch120_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5461 "ConfigurationInterfaces.c" +#line 5500 "ConfigurationInterfaces.c" } __finally120: #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5470,8 +5509,8 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 5470 "ConfigurationInterfaces.c" + return _tmp7_; +#line 5509 "ConfigurationInterfaces.c" } @@ -5480,7 +5519,7 @@ gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* se g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_events_sort_ascending (self); -#line 5479 "ConfigurationInterfaces.c" +#line 5518 "ConfigurationInterfaces.c" } @@ -5504,7 +5543,7 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5503 "ConfigurationInterfaces.c" +#line 5542 "ConfigurationInterfaces.c" goto __catch121_configuration_error; } #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5513,7 +5552,7 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa g_clear_error (&_inner_error_); #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5512 "ConfigurationInterfaces.c" +#line 5551 "ConfigurationInterfaces.c" } } goto __finally121; @@ -5533,7 +5572,7 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa _g_error_free0 (err); #line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5532 "ConfigurationInterfaces.c" +#line 5571 "ConfigurationInterfaces.c" } __finally121: #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5544,7 +5583,7 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa g_clear_error (&_inner_error_); #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5543 "ConfigurationInterfaces.c" +#line 5582 "ConfigurationInterfaces.c" } } @@ -5554,7 +5593,7 @@ void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_events_sort_ascending (self, sort); -#line 5553 "ConfigurationInterfaces.c" +#line 5592 "ConfigurationInterfaces.c" } @@ -5584,7 +5623,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5583 "ConfigurationInterfaces.c" +#line 5622 "ConfigurationInterfaces.c" goto __catch122_configuration_error; } #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5593,7 +5632,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac g_clear_error (&_inner_error_); #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 5592 "ConfigurationInterfaces.c" +#line 5631 "ConfigurationInterfaces.c" } #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -5605,7 +5644,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac _g_free0 (_tmp0_); #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5604 "ConfigurationInterfaces.c" +#line 5643 "ConfigurationInterfaces.c" } goto __finally122; __catch122_configuration_error: @@ -5629,7 +5668,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac _g_error_free0 (err); #line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5628 "ConfigurationInterfaces.c" +#line 5667 "ConfigurationInterfaces.c" } __finally122: #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5638,7 +5677,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac g_clear_error (&_inner_error_); #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 5637 "ConfigurationInterfaces.c" +#line 5676 "ConfigurationInterfaces.c" } @@ -5647,7 +5686,7 @@ gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_photo_app (self); -#line 5646 "ConfigurationInterfaces.c" +#line 5685 "ConfigurationInterfaces.c" } @@ -5655,7 +5694,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad GError * _inner_error_ = NULL; #line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (external_photo_app != NULL); -#line 5654 "ConfigurationInterfaces.c" +#line 5693 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -5674,7 +5713,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad if (G_UNLIKELY (_inner_error_ != NULL)) { #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5673 "ConfigurationInterfaces.c" +#line 5712 "ConfigurationInterfaces.c" goto __catch123_configuration_error; } #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5683,7 +5722,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad g_clear_error (&_inner_error_); #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5682 "ConfigurationInterfaces.c" +#line 5721 "ConfigurationInterfaces.c" } } goto __finally123; @@ -5703,7 +5742,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad _g_error_free0 (err); #line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5702 "ConfigurationInterfaces.c" +#line 5741 "ConfigurationInterfaces.c" } __finally123: #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5714,7 +5753,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad g_clear_error (&_inner_error_); #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5713 "ConfigurationInterfaces.c" +#line 5752 "ConfigurationInterfaces.c" } } @@ -5724,7 +5763,7 @@ void configuration_facade_set_external_photo_app (ConfigurationFacade* self, con g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_external_photo_app (self, external_photo_app); -#line 5723 "ConfigurationInterfaces.c" +#line 5762 "ConfigurationInterfaces.c" } @@ -5754,7 +5793,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad if (G_UNLIKELY (_inner_error_ != NULL)) { #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5753 "ConfigurationInterfaces.c" +#line 5792 "ConfigurationInterfaces.c" goto __catch124_configuration_error; } #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5763,7 +5802,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad g_clear_error (&_inner_error_); #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 5762 "ConfigurationInterfaces.c" +#line 5801 "ConfigurationInterfaces.c" } #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -5775,7 +5814,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad _g_free0 (_tmp0_); #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5774 "ConfigurationInterfaces.c" +#line 5813 "ConfigurationInterfaces.c" } goto __finally124; __catch124_configuration_error: @@ -5799,7 +5838,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad _g_error_free0 (err); #line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5798 "ConfigurationInterfaces.c" +#line 5837 "ConfigurationInterfaces.c" } __finally124: #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5808,7 +5847,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad g_clear_error (&_inner_error_); #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 5807 "ConfigurationInterfaces.c" +#line 5846 "ConfigurationInterfaces.c" } @@ -5817,7 +5856,7 @@ gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 886 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_raw_app (self); -#line 5816 "ConfigurationInterfaces.c" +#line 5855 "ConfigurationInterfaces.c" } @@ -5825,7 +5864,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* GError * _inner_error_ = NULL; #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (external_raw_app != NULL); -#line 5824 "ConfigurationInterfaces.c" +#line 5863 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -5844,7 +5883,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5843 "ConfigurationInterfaces.c" +#line 5882 "ConfigurationInterfaces.c" goto __catch125_configuration_error; } #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5853,7 +5892,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* g_clear_error (&_inner_error_); #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5852 "ConfigurationInterfaces.c" +#line 5891 "ConfigurationInterfaces.c" } } goto __finally125; @@ -5873,7 +5912,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* _g_error_free0 (err); #line 902 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5872 "ConfigurationInterfaces.c" +#line 5911 "ConfigurationInterfaces.c" } __finally125: #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5884,7 +5923,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* g_clear_error (&_inner_error_); #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 5883 "ConfigurationInterfaces.c" +#line 5922 "ConfigurationInterfaces.c" } } @@ -5894,7 +5933,7 @@ void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_external_raw_app (self, external_raw_app); -#line 5893 "ConfigurationInterfaces.c" +#line 5932 "ConfigurationInterfaces.c" } @@ -5923,7 +5962,7 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur if (G_UNLIKELY (_inner_error_ != NULL)) { #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 5922 "ConfigurationInterfaces.c" +#line 5961 "ConfigurationInterfaces.c" goto __catch126_configuration_error; } #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5932,13 +5971,13 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur g_clear_error (&_inner_error_); #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 5931 "ConfigurationInterfaces.c" +#line 5970 "ConfigurationInterfaces.c" } #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = (ScaleConstraint) _tmp0_; #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5937 "ConfigurationInterfaces.c" +#line 5976 "ConfigurationInterfaces.c" } goto __finally126; __catch126_configuration_error: @@ -5959,7 +5998,7 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur _g_error_free0 (err); #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 5958 "ConfigurationInterfaces.c" +#line 5997 "ConfigurationInterfaces.c" } __finally126: #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -5968,7 +6007,7 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur g_clear_error (&_inner_error_); #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 5967 "ConfigurationInterfaces.c" +#line 6006 "ConfigurationInterfaces.c" } @@ -5977,7 +6016,7 @@ ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_constraint (self); -#line 5976 "ConfigurationInterfaces.c" +#line 6015 "ConfigurationInterfaces.c" } @@ -6001,7 +6040,7 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade if (G_UNLIKELY (_inner_error_ != NULL)) { #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6000 "ConfigurationInterfaces.c" +#line 6039 "ConfigurationInterfaces.c" goto __catch127_configuration_error; } #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6010,7 +6049,7 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade g_clear_error (&_inner_error_); #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6009 "ConfigurationInterfaces.c" +#line 6048 "ConfigurationInterfaces.c" } } goto __finally127; @@ -6030,7 +6069,7 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade _g_error_free0 (err); #line 924 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6029 "ConfigurationInterfaces.c" +#line 6068 "ConfigurationInterfaces.c" } __finally127: #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6041,7 +6080,7 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade g_clear_error (&_inner_error_); #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6040 "ConfigurationInterfaces.c" +#line 6079 "ConfigurationInterfaces.c" } } @@ -6051,7 +6090,7 @@ void configuration_facade_set_export_constraint (ConfigurationFacade* self, Scal g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 919 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_constraint (self, constraint); -#line 6050 "ConfigurationInterfaces.c" +#line 6089 "ConfigurationInterfaces.c" } @@ -6080,7 +6119,7 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode if (G_UNLIKELY (_inner_error_ != NULL)) { #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6079 "ConfigurationInterfaces.c" +#line 6118 "ConfigurationInterfaces.c" goto __catch128_configuration_error; } #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6089,13 +6128,13 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode g_clear_error (&_inner_error_); #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6088 "ConfigurationInterfaces.c" +#line 6127 "ConfigurationInterfaces.c" } #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = (ExportFormatMode) _tmp0_; #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6094 "ConfigurationInterfaces.c" +#line 6133 "ConfigurationInterfaces.c" } goto __finally128; __catch128_configuration_error: @@ -6116,7 +6155,7 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode _g_error_free0 (err); #line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6115 "ConfigurationInterfaces.c" +#line 6154 "ConfigurationInterfaces.c" } __finally128: #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6125,7 +6164,7 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode g_clear_error (&_inner_error_); #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6124 "ConfigurationInterfaces.c" +#line 6163 "ConfigurationInterfaces.c" } @@ -6134,7 +6173,7 @@ ExportFormatMode configuration_facade_get_export_export_format_mode (Configurati g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_format_mode (self); -#line 6133 "ConfigurationInterfaces.c" +#line 6172 "ConfigurationInterfaces.c" } @@ -6158,7 +6197,7 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati if (G_UNLIKELY (_inner_error_ != NULL)) { #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6157 "ConfigurationInterfaces.c" +#line 6196 "ConfigurationInterfaces.c" goto __catch129_configuration_error; } #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6167,7 +6206,7 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati g_clear_error (&_inner_error_); #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6166 "ConfigurationInterfaces.c" +#line 6205 "ConfigurationInterfaces.c" } } goto __finally129; @@ -6187,7 +6226,7 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati _g_error_free0 (err); #line 943 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6186 "ConfigurationInterfaces.c" +#line 6225 "ConfigurationInterfaces.c" } __finally129: #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6198,7 +6237,7 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati g_clear_error (&_inner_error_); #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6197 "ConfigurationInterfaces.c" +#line 6236 "ConfigurationInterfaces.c" } } @@ -6208,12 +6247,13 @@ void configuration_facade_set_export_export_format_mode (ConfigurationFacade* se g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_format_mode (self, export_format_mode); -#line 6207 "ConfigurationInterfaces.c" +#line 6246 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_export_export_metadata (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -6235,9 +6275,11 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat _tmp0_ = _tmp4_; #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 6274 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6236 "ConfigurationInterfaces.c" +#line 6278 "ConfigurationInterfaces.c" goto __catch130_configuration_error; } #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6245,35 +6287,35 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 6245 "ConfigurationInterfaces.c" + return _tmp5_; +#line 6287 "ConfigurationInterfaces.c" } #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6251 "ConfigurationInterfaces.c" +#line 6293 "ConfigurationInterfaces.c" } goto __finally130; __catch130_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 951 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 951 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6272 "ConfigurationInterfaces.c" +#line 6314 "ConfigurationInterfaces.c" } __finally130: #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6281,8 +6323,8 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 6281 "ConfigurationInterfaces.c" + return _tmp7_; +#line 6323 "ConfigurationInterfaces.c" } @@ -6291,7 +6333,7 @@ gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* s g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 947 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_metadata (self); -#line 6290 "ConfigurationInterfaces.c" +#line 6332 "ConfigurationInterfaces.c" } @@ -6315,7 +6357,7 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF if (G_UNLIKELY (_inner_error_ != NULL)) { #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6314 "ConfigurationInterfaces.c" +#line 6356 "ConfigurationInterfaces.c" goto __catch131_configuration_error; } #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6324,7 +6366,7 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF g_clear_error (&_inner_error_); #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6323 "ConfigurationInterfaces.c" +#line 6365 "ConfigurationInterfaces.c" } } goto __finally131; @@ -6344,7 +6386,7 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF _g_error_free0 (err); #line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6343 "ConfigurationInterfaces.c" +#line 6385 "ConfigurationInterfaces.c" } __finally131: #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6355,7 +6397,7 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF g_clear_error (&_inner_error_); #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6354 "ConfigurationInterfaces.c" +#line 6396 "ConfigurationInterfaces.c" } } @@ -6365,7 +6407,7 @@ void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 957 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_metadata (self, export_metadata); -#line 6364 "ConfigurationInterfaces.c" +#line 6406 "ConfigurationInterfaces.c" } @@ -6395,7 +6437,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C if (G_UNLIKELY (_inner_error_ != NULL)) { #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6394 "ConfigurationInterfaces.c" +#line 6436 "ConfigurationInterfaces.c" goto __catch132_configuration_error; } #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6404,7 +6446,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C g_clear_error (&_inner_error_); #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6403 "ConfigurationInterfaces.c" +#line 6445 "ConfigurationInterfaces.c" } #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = photo_file_format_unserialize (_tmp0_); @@ -6412,7 +6454,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C result = _tmp5_; #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6411 "ConfigurationInterfaces.c" +#line 6453 "ConfigurationInterfaces.c" } goto __finally132; __catch132_configuration_error: @@ -6433,7 +6475,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C _g_error_free0 (err); #line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6432 "ConfigurationInterfaces.c" +#line 6474 "ConfigurationInterfaces.c" } __finally132: #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6442,7 +6484,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C g_clear_error (&_inner_error_); #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6441 "ConfigurationInterfaces.c" +#line 6483 "ConfigurationInterfaces.c" } @@ -6451,7 +6493,7 @@ PhotoFileFormat configuration_facade_get_export_photo_file_format (Configuration g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 966 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_photo_file_format (self); -#line 6450 "ConfigurationInterfaces.c" +#line 6492 "ConfigurationInterfaces.c" } @@ -6478,7 +6520,7 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio if (G_UNLIKELY (_inner_error_ != NULL)) { #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6477 "ConfigurationInterfaces.c" +#line 6519 "ConfigurationInterfaces.c" goto __catch133_configuration_error; } #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6487,7 +6529,7 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio g_clear_error (&_inner_error_); #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6486 "ConfigurationInterfaces.c" +#line 6528 "ConfigurationInterfaces.c" } } goto __finally133; @@ -6507,7 +6549,7 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio _g_error_free0 (err); #line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6506 "ConfigurationInterfaces.c" +#line 6548 "ConfigurationInterfaces.c" } __finally133: #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6518,7 +6560,7 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio g_clear_error (&_inner_error_); #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6517 "ConfigurationInterfaces.c" +#line 6559 "ConfigurationInterfaces.c" } } @@ -6528,7 +6570,7 @@ void configuration_facade_set_export_photo_file_format (ConfigurationFacade* sel g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 976 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_photo_file_format (self, photo_file_format); -#line 6527 "ConfigurationInterfaces.c" +#line 6569 "ConfigurationInterfaces.c" } @@ -6557,7 +6599,7 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6556 "ConfigurationInterfaces.c" +#line 6598 "ConfigurationInterfaces.c" goto __catch134_configuration_error; } #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6566,13 +6608,13 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa g_clear_error (&_inner_error_); #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6565 "ConfigurationInterfaces.c" +#line 6607 "ConfigurationInterfaces.c" } #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = (JpegQuality) _tmp0_; #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6571 "ConfigurationInterfaces.c" +#line 6613 "ConfigurationInterfaces.c" } goto __finally134; __catch134_configuration_error: @@ -6593,7 +6635,7 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa _g_error_free0 (err); #line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6592 "ConfigurationInterfaces.c" +#line 6634 "ConfigurationInterfaces.c" } __finally134: #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6602,7 +6644,7 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa g_clear_error (&_inner_error_); #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6601 "ConfigurationInterfaces.c" +#line 6643 "ConfigurationInterfaces.c" } @@ -6611,7 +6653,7 @@ JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self) g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_quality (self); -#line 6610 "ConfigurationInterfaces.c" +#line 6652 "ConfigurationInterfaces.c" } @@ -6635,7 +6677,7 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s if (G_UNLIKELY (_inner_error_ != NULL)) { #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6634 "ConfigurationInterfaces.c" +#line 6676 "ConfigurationInterfaces.c" goto __catch135_configuration_error; } #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6644,7 +6686,7 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s g_clear_error (&_inner_error_); #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6643 "ConfigurationInterfaces.c" +#line 6685 "ConfigurationInterfaces.c" } } goto __finally135; @@ -6664,7 +6706,7 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s _g_error_free0 (err); #line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6663 "ConfigurationInterfaces.c" +#line 6705 "ConfigurationInterfaces.c" } __finally135: #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6675,7 +6717,7 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s g_clear_error (&_inner_error_); #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6674 "ConfigurationInterfaces.c" +#line 6716 "ConfigurationInterfaces.c" } } @@ -6685,12 +6727,13 @@ void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQua g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 995 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_quality (self, quality); -#line 6684 "ConfigurationInterfaces.c" +#line 6726 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_export_scale (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -6712,9 +6755,11 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel _tmp0_ = _tmp4_; #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 6754 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6713 "ConfigurationInterfaces.c" +#line 6758 "ConfigurationInterfaces.c" goto __catch136_configuration_error; } #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6722,35 +6767,35 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 6722 "ConfigurationInterfaces.c" + return _tmp5_; +#line 6767 "ConfigurationInterfaces.c" } #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6728 "ConfigurationInterfaces.c" +#line 6773 "ConfigurationInterfaces.c" } goto __finally136; __catch136_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1008 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1008 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6749 "ConfigurationInterfaces.c" +#line 6794 "ConfigurationInterfaces.c" } __finally136: #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6758,8 +6803,8 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 6758 "ConfigurationInterfaces.c" + return _tmp7_; +#line 6803 "ConfigurationInterfaces.c" } @@ -6768,7 +6813,7 @@ gint configuration_facade_get_export_scale (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_scale (self); -#line 6767 "ConfigurationInterfaces.c" +#line 6812 "ConfigurationInterfaces.c" } @@ -6792,7 +6837,7 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6791 "ConfigurationInterfaces.c" +#line 6836 "ConfigurationInterfaces.c" goto __catch137_configuration_error; } #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6801,7 +6846,7 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel g_clear_error (&_inner_error_); #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6800 "ConfigurationInterfaces.c" +#line 6845 "ConfigurationInterfaces.c" } } goto __finally137; @@ -6821,7 +6866,7 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel _g_error_free0 (err); #line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6820 "ConfigurationInterfaces.c" +#line 6865 "ConfigurationInterfaces.c" } __finally137: #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6832,7 +6877,7 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel g_clear_error (&_inner_error_); #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6831 "ConfigurationInterfaces.c" +#line 6876 "ConfigurationInterfaces.c" } } @@ -6842,7 +6887,7 @@ void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scal g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1014 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_export_scale (self, scale); -#line 6841 "ConfigurationInterfaces.c" +#line 6886 "ConfigurationInterfaces.c" } @@ -6872,7 +6917,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6871 "ConfigurationInterfaces.c" +#line 6916 "ConfigurationInterfaces.c" goto __catch138_configuration_error; } #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6881,7 +6926,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu g_clear_error (&_inner_error_); #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6880 "ConfigurationInterfaces.c" +#line 6925 "ConfigurationInterfaces.c" } #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = raw_developer_from_string (_tmp0_); @@ -6891,7 +6936,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu _g_free0 (_tmp0_); #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6890 "ConfigurationInterfaces.c" +#line 6935 "ConfigurationInterfaces.c" } goto __finally138; __catch138_configuration_error: @@ -6912,7 +6957,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu _g_error_free0 (err); #line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 6911 "ConfigurationInterfaces.c" +#line 6956 "ConfigurationInterfaces.c" } __finally138: #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6921,7 +6966,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu g_clear_error (&_inner_error_); #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return 0; -#line 6920 "ConfigurationInterfaces.c" +#line 6965 "ConfigurationInterfaces.c" } @@ -6930,7 +6975,7 @@ RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_default_raw_developer (self); -#line 6929 "ConfigurationInterfaces.c" +#line 6974 "ConfigurationInterfaces.c" } @@ -6962,7 +7007,7 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 6961 "ConfigurationInterfaces.c" +#line 7006 "ConfigurationInterfaces.c" goto __catch139_configuration_error; } #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -6971,7 +7016,7 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa g_clear_error (&_inner_error_); #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6970 "ConfigurationInterfaces.c" +#line 7015 "ConfigurationInterfaces.c" } } goto __finally139; @@ -6991,7 +7036,7 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa _g_error_free0 (err); #line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 6990 "ConfigurationInterfaces.c" +#line 7035 "ConfigurationInterfaces.c" } __finally139: #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7002,7 +7047,7 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa g_clear_error (&_inner_error_); #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7001 "ConfigurationInterfaces.c" +#line 7046 "ConfigurationInterfaces.c" } } @@ -7012,12 +7057,13 @@ void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_default_raw_developer (self, d); -#line 7011 "ConfigurationInterfaces.c" +#line 7056 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_hide_photos_already_imported (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -7039,9 +7085,11 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf _tmp0_ = _tmp4_; #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 7084 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7040 "ConfigurationInterfaces.c" +#line 7088 "ConfigurationInterfaces.c" goto __catch140_configuration_error; } #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7049,35 +7097,35 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 7049 "ConfigurationInterfaces.c" + return _tmp5_; +#line 7097 "ConfigurationInterfaces.c" } #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7055 "ConfigurationInterfaces.c" +#line 7103 "ConfigurationInterfaces.c" } goto __finally140; __catch140_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7076 "ConfigurationInterfaces.c" +#line 7124 "ConfigurationInterfaces.c" } __finally140: #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7085,8 +7133,8 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 7085 "ConfigurationInterfaces.c" + return _tmp7_; +#line 7133 "ConfigurationInterfaces.c" } @@ -7095,7 +7143,7 @@ gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFac g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1050 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_hide_photos_already_imported (self); -#line 7094 "ConfigurationInterfaces.c" +#line 7142 "ConfigurationInterfaces.c" } @@ -7119,7 +7167,7 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7118 "ConfigurationInterfaces.c" +#line 7166 "ConfigurationInterfaces.c" goto __catch141_configuration_error; } #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7128,7 +7176,7 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur g_clear_error (&_inner_error_); #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7127 "ConfigurationInterfaces.c" +#line 7175 "ConfigurationInterfaces.c" } } goto __finally141; @@ -7146,7 +7194,7 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur configuration_facade_on_configuration_error (self, _tmp3_); #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 7145 "ConfigurationInterfaces.c" +#line 7193 "ConfigurationInterfaces.c" } __finally141: #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7157,7 +7205,7 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur g_clear_error (&_inner_error_); #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7156 "ConfigurationInterfaces.c" +#line 7204 "ConfigurationInterfaces.c" } } @@ -7167,7 +7215,7 @@ void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1060 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_hide_photos_already_imported (self, hide_imported); -#line 7166 "ConfigurationInterfaces.c" +#line 7214 "ConfigurationInterfaces.c" } @@ -7197,7 +7245,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7196 "ConfigurationInterfaces.c" +#line 7244 "ConfigurationInterfaces.c" goto __catch142_configuration_error; } #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7206,7 +7254,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel g_clear_error (&_inner_error_); #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 7205 "ConfigurationInterfaces.c" +#line 7253 "ConfigurationInterfaces.c" } #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -7218,7 +7266,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel _g_free0 (_tmp0_); #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7217 "ConfigurationInterfaces.c" +#line 7265 "ConfigurationInterfaces.c" } goto __finally142; __catch142_configuration_error: @@ -7242,7 +7290,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel _g_error_free0 (err); #line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7241 "ConfigurationInterfaces.c" +#line 7289 "ConfigurationInterfaces.c" } __finally142: #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7251,7 +7299,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel g_clear_error (&_inner_error_); #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 7250 "ConfigurationInterfaces.c" +#line 7298 "ConfigurationInterfaces.c" } @@ -7260,7 +7308,7 @@ gchar* configuration_facade_get_import_dir (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1071 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_import_dir (self); -#line 7259 "ConfigurationInterfaces.c" +#line 7307 "ConfigurationInterfaces.c" } @@ -7268,7 +7316,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, GError * _inner_error_ = NULL; #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (import_dir != NULL); -#line 7267 "ConfigurationInterfaces.c" +#line 7315 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -7287,7 +7335,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7286 "ConfigurationInterfaces.c" +#line 7334 "ConfigurationInterfaces.c" goto __catch143_configuration_error; } #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7296,7 +7344,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, g_clear_error (&_inner_error_); #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7295 "ConfigurationInterfaces.c" +#line 7343 "ConfigurationInterfaces.c" } } goto __finally143; @@ -7314,7 +7362,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, configuration_facade_on_configuration_error (self, _tmp3_); #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 7313 "ConfigurationInterfaces.c" +#line 7361 "ConfigurationInterfaces.c" } __finally143: #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7325,7 +7373,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, g_clear_error (&_inner_error_); #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7324 "ConfigurationInterfaces.c" +#line 7372 "ConfigurationInterfaces.c" } } @@ -7335,12 +7383,13 @@ void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_import_dir (self, import_dir); -#line 7334 "ConfigurationInterfaces.c" +#line 7382 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -7362,9 +7411,11 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca _tmp0_ = _tmp4_; #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 7410 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7363 "ConfigurationInterfaces.c" +#line 7414 "ConfigurationInterfaces.c" goto __catch144_configuration_error; } #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7372,35 +7423,35 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 7372 "ConfigurationInterfaces.c" + return _tmp5_; +#line 7423 "ConfigurationInterfaces.c" } #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7378 "ConfigurationInterfaces.c" +#line 7429 "ConfigurationInterfaces.c" } goto __finally144; __catch144_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1096 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1096 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7399 "ConfigurationInterfaces.c" +#line 7450 "ConfigurationInterfaces.c" } __finally144: #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7408,8 +7459,8 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 7408 "ConfigurationInterfaces.c" + return _tmp7_; +#line 7459 "ConfigurationInterfaces.c" } @@ -7418,7 +7469,7 @@ gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_keep_relativity (self); -#line 7417 "ConfigurationInterfaces.c" +#line 7468 "ConfigurationInterfaces.c" } @@ -7442,7 +7493,7 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7441 "ConfigurationInterfaces.c" +#line 7492 "ConfigurationInterfaces.c" goto __catch145_configuration_error; } #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7451,7 +7502,7 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7450 "ConfigurationInterfaces.c" +#line 7501 "ConfigurationInterfaces.c" } } goto __finally145; @@ -7469,7 +7520,7 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* configuration_facade_on_configuration_error (self, _tmp3_); #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 7468 "ConfigurationInterfaces.c" +#line 7519 "ConfigurationInterfaces.c" } __finally145: #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7480,7 +7531,7 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7479 "ConfigurationInterfaces.c" +#line 7530 "ConfigurationInterfaces.c" } } @@ -7490,12 +7541,13 @@ void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboole g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_keep_relativity (self, keep_relativity); -#line 7489 "ConfigurationInterfaces.c" +#line 7540 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -7517,9 +7569,11 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa _tmp0_ = _tmp4_; #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 7568 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7518 "ConfigurationInterfaces.c" +#line 7572 "ConfigurationInterfaces.c" goto __catch146_configuration_error; } #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7527,35 +7581,35 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 7527 "ConfigurationInterfaces.c" + return _tmp5_; +#line 7581 "ConfigurationInterfaces.c" } #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7533 "ConfigurationInterfaces.c" +#line 7587 "ConfigurationInterfaces.c" } goto __finally146; __catch146_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7554 "ConfigurationInterfaces.c" +#line 7608 "ConfigurationInterfaces.c" } __finally146: #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7563,8 +7617,8 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 7563 "ConfigurationInterfaces.c" + return _tmp7_; +#line 7617 "ConfigurationInterfaces.c" } @@ -7573,7 +7627,7 @@ gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self) g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_pin_toolbar_state (self); -#line 7572 "ConfigurationInterfaces.c" +#line 7626 "ConfigurationInterfaces.c" } @@ -7597,7 +7651,7 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7596 "ConfigurationInterfaces.c" +#line 7650 "ConfigurationInterfaces.c" goto __catch147_configuration_error; } #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7606,7 +7660,7 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade g_clear_error (&_inner_error_); #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7605 "ConfigurationInterfaces.c" +#line 7659 "ConfigurationInterfaces.c" } } goto __finally147; @@ -7624,7 +7678,7 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade configuration_facade_on_configuration_error (self, _tmp3_); #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 7623 "ConfigurationInterfaces.c" +#line 7677 "ConfigurationInterfaces.c" } __finally147: #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7635,7 +7689,7 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade g_clear_error (&_inner_error_); #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7634 "ConfigurationInterfaces.c" +#line 7688 "ConfigurationInterfaces.c" } } @@ -7645,12 +7699,13 @@ void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboo g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_pin_toolbar_state (self, state); -#line 7644 "ConfigurationInterfaces.c" +#line 7698 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -7672,9 +7727,11 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade* _tmp0_ = _tmp4_; #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 7726 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7673 "ConfigurationInterfaces.c" +#line 7730 "ConfigurationInterfaces.c" goto __catch148_configuration_error; } #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7682,35 +7739,35 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade* #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 7682 "ConfigurationInterfaces.c" + return _tmp5_; +#line 7739 "ConfigurationInterfaces.c" } #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7688 "ConfigurationInterfaces.c" +#line 7745 "ConfigurationInterfaces.c" } goto __finally148; __catch148_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 1; #line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7709 "ConfigurationInterfaces.c" +#line 7766 "ConfigurationInterfaces.c" } __finally148: #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7718,8 +7775,8 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade* #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 7718 "ConfigurationInterfaces.c" + return _tmp7_; +#line 7775 "ConfigurationInterfaces.c" } @@ -7728,7 +7785,7 @@ gint configuration_facade_get_last_crop_height (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_height (self); -#line 7727 "ConfigurationInterfaces.c" +#line 7784 "ConfigurationInterfaces.c" } @@ -7752,7 +7809,7 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7751 "ConfigurationInterfaces.c" +#line 7808 "ConfigurationInterfaces.c" goto __catch149_configuration_error; } #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7761,7 +7818,7 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7760 "ConfigurationInterfaces.c" +#line 7817 "ConfigurationInterfaces.c" } } goto __finally149; @@ -7779,7 +7836,7 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* configuration_facade_on_configuration_error (self, _tmp3_); #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 7778 "ConfigurationInterfaces.c" +#line 7835 "ConfigurationInterfaces.c" } __finally149: #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7790,7 +7847,7 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7789 "ConfigurationInterfaces.c" +#line 7846 "ConfigurationInterfaces.c" } } @@ -7800,12 +7857,13 @@ void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_height (self, choice); -#line 7799 "ConfigurationInterfaces.c" +#line 7856 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -7827,9 +7885,11 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa _tmp0_ = _tmp4_; #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 7884 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7828 "ConfigurationInterfaces.c" +#line 7888 "ConfigurationInterfaces.c" goto __catch150_configuration_error; } #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7837,35 +7897,35 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 7837 "ConfigurationInterfaces.c" + return _tmp5_; +#line 7897 "ConfigurationInterfaces.c" } #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7843 "ConfigurationInterfaces.c" +#line 7903 "ConfigurationInterfaces.c" } goto __finally150; __catch150_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7864 "ConfigurationInterfaces.c" +#line 7924 "ConfigurationInterfaces.c" } __finally150: #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7873,8 +7933,8 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 7873 "ConfigurationInterfaces.c" + return _tmp7_; +#line 7933 "ConfigurationInterfaces.c" } @@ -7883,7 +7943,7 @@ gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self) g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_menu_choice (self); -#line 7882 "ConfigurationInterfaces.c" +#line 7942 "ConfigurationInterfaces.c" } @@ -7907,7 +7967,7 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7906 "ConfigurationInterfaces.c" +#line 7966 "ConfigurationInterfaces.c" goto __catch151_configuration_error; } #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7916,7 +7976,7 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa g_clear_error (&_inner_error_); #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7915 "ConfigurationInterfaces.c" +#line 7975 "ConfigurationInterfaces.c" } } goto __finally151; @@ -7934,7 +7994,7 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa configuration_facade_on_configuration_error (self, _tmp3_); #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 7933 "ConfigurationInterfaces.c" +#line 7993 "ConfigurationInterfaces.c" } __finally151: #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7945,7 +8005,7 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa g_clear_error (&_inner_error_); #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 7944 "ConfigurationInterfaces.c" +#line 8004 "ConfigurationInterfaces.c" } } @@ -7955,12 +8015,13 @@ void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_menu_choice (self, choice); -#line 7954 "ConfigurationInterfaces.c" +#line 8014 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -7982,9 +8043,11 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade* _tmp0_ = _tmp4_; #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 8042 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 7983 "ConfigurationInterfaces.c" +#line 8046 "ConfigurationInterfaces.c" goto __catch152_configuration_error; } #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -7992,35 +8055,35 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade* #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 7992 "ConfigurationInterfaces.c" + return _tmp5_; +#line 8055 "ConfigurationInterfaces.c" } #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 7998 "ConfigurationInterfaces.c" +#line 8061 "ConfigurationInterfaces.c" } goto __finally152; __catch152_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 1; #line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8019 "ConfigurationInterfaces.c" +#line 8082 "ConfigurationInterfaces.c" } __finally152: #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8028,8 +8091,8 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade* #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 8028 "ConfigurationInterfaces.c" + return _tmp7_; +#line 8091 "ConfigurationInterfaces.c" } @@ -8038,7 +8101,7 @@ gint configuration_facade_get_last_crop_width (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_width (self); -#line 8037 "ConfigurationInterfaces.c" +#line 8100 "ConfigurationInterfaces.c" } @@ -8062,7 +8125,7 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8061 "ConfigurationInterfaces.c" +#line 8124 "ConfigurationInterfaces.c" goto __catch153_configuration_error; } #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8071,7 +8134,7 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8070 "ConfigurationInterfaces.c" +#line 8133 "ConfigurationInterfaces.c" } } goto __finally153; @@ -8089,7 +8152,7 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* configuration_facade_on_configuration_error (self, _tmp3_); #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8088 "ConfigurationInterfaces.c" +#line 8151 "ConfigurationInterfaces.c" } __finally153: #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8100,7 +8163,7 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8099 "ConfigurationInterfaces.c" +#line 8162 "ConfigurationInterfaces.c" } } @@ -8110,7 +8173,7 @@ void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint c g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_width (self, choice); -#line 8109 "ConfigurationInterfaces.c" +#line 8172 "ConfigurationInterfaces.c" } @@ -8140,7 +8203,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8139 "ConfigurationInterfaces.c" +#line 8202 "ConfigurationInterfaces.c" goto __catch154_configuration_error; } #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8149,7 +8212,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca g_clear_error (&_inner_error_); #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 8148 "ConfigurationInterfaces.c" +#line 8211 "ConfigurationInterfaces.c" } #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -8161,7 +8224,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca _g_free0 (_tmp0_); #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8160 "ConfigurationInterfaces.c" +#line 8223 "ConfigurationInterfaces.c" } goto __finally154; __catch154_configuration_error: @@ -8185,7 +8248,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca _g_error_free0 (err); #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8184 "ConfigurationInterfaces.c" +#line 8247 "ConfigurationInterfaces.c" } __finally154: #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8194,7 +8257,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca g_clear_error (&_inner_error_); #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 8193 "ConfigurationInterfaces.c" +#line 8256 "ConfigurationInterfaces.c" } @@ -8203,7 +8266,7 @@ gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_service (self); -#line 8202 "ConfigurationInterfaces.c" +#line 8265 "ConfigurationInterfaces.c" } @@ -8211,7 +8274,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade GError * _inner_error_ = NULL; #line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (service_name != NULL); -#line 8210 "ConfigurationInterfaces.c" +#line 8273 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -8230,7 +8293,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8229 "ConfigurationInterfaces.c" +#line 8292 "ConfigurationInterfaces.c" goto __catch155_configuration_error; } #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8239,7 +8302,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade g_clear_error (&_inner_error_); #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8238 "ConfigurationInterfaces.c" +#line 8301 "ConfigurationInterfaces.c" } } goto __finally155; @@ -8257,7 +8320,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade configuration_facade_on_configuration_error (self, _tmp3_); #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8256 "ConfigurationInterfaces.c" +#line 8319 "ConfigurationInterfaces.c" } __finally155: #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8268,7 +8331,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade g_clear_error (&_inner_error_); #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8267 "ConfigurationInterfaces.c" +#line 8330 "ConfigurationInterfaces.c" } } @@ -8278,7 +8341,7 @@ void configuration_facade_set_last_used_service (ConfigurationFacade* self, cons g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_service (self, service_name); -#line 8277 "ConfigurationInterfaces.c" +#line 8340 "ConfigurationInterfaces.c" } @@ -8308,7 +8371,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8307 "ConfigurationInterfaces.c" +#line 8370 "ConfigurationInterfaces.c" goto __catch156_configuration_error; } #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8317,7 +8380,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi g_clear_error (&_inner_error_); #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 8316 "ConfigurationInterfaces.c" +#line 8379 "ConfigurationInterfaces.c" } #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -8329,7 +8392,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi _g_free0 (_tmp0_); #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8328 "ConfigurationInterfaces.c" +#line 8391 "ConfigurationInterfaces.c" } goto __finally156; __catch156_configuration_error: @@ -8353,7 +8416,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi _g_error_free0 (err); #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 8352 "ConfigurationInterfaces.c" +#line 8415 "ConfigurationInterfaces.c" } __finally156: #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8362,7 +8425,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi g_clear_error (&_inner_error_); #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 8361 "ConfigurationInterfaces.c" +#line 8424 "ConfigurationInterfaces.c" } @@ -8371,7 +8434,7 @@ gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFaca g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_dataimports_service (self); -#line 8370 "ConfigurationInterfaces.c" +#line 8433 "ConfigurationInterfaces.c" } @@ -8379,7 +8442,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu GError * _inner_error_ = NULL; #line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (service_name != NULL); -#line 8378 "ConfigurationInterfaces.c" +#line 8441 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -8398,7 +8461,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8397 "ConfigurationInterfaces.c" +#line 8460 "ConfigurationInterfaces.c" goto __catch157_configuration_error; } #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8407,7 +8470,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu g_clear_error (&_inner_error_); #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8406 "ConfigurationInterfaces.c" +#line 8469 "ConfigurationInterfaces.c" } } goto __finally157; @@ -8425,7 +8488,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu configuration_facade_on_configuration_error (self, _tmp3_); #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8424 "ConfigurationInterfaces.c" +#line 8487 "ConfigurationInterfaces.c" } __finally157: #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8436,7 +8499,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu g_clear_error (&_inner_error_); #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8435 "ConfigurationInterfaces.c" +#line 8498 "ConfigurationInterfaces.c" } } @@ -8446,7 +8509,7 @@ void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_dataimports_service (self, service_name); -#line 8445 "ConfigurationInterfaces.c" +#line 8508 "ConfigurationInterfaces.c" } @@ -8458,7 +8521,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca _vala_sort_order = FALSE; #line 1247 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_by = 2; -#line 8457 "ConfigurationInterfaces.c" +#line 8520 "ConfigurationInterfaces.c" { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_ = NULL; @@ -8486,7 +8549,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8485 "ConfigurationInterfaces.c" +#line 8548 "ConfigurationInterfaces.c" goto __catch158_configuration_error; } #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8495,7 +8558,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8494 "ConfigurationInterfaces.c" +#line 8557 "ConfigurationInterfaces.c" } #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_order = _tmp0_; @@ -8515,7 +8578,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8514 "ConfigurationInterfaces.c" +#line 8577 "ConfigurationInterfaces.c" goto __catch158_configuration_error; } #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8524,11 +8587,11 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8523 "ConfigurationInterfaces.c" +#line 8586 "ConfigurationInterfaces.c" } #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_sort_by = _tmp5_; -#line 8527 "ConfigurationInterfaces.c" +#line 8590 "ConfigurationInterfaces.c" } goto __finally158; __catch158_configuration_error: @@ -8545,7 +8608,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca configuration_facade_on_configuration_error (self, _tmp10_); #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8544 "ConfigurationInterfaces.c" +#line 8607 "ConfigurationInterfaces.c" } __finally158: #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8556,19 +8619,19 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8555 "ConfigurationInterfaces.c" +#line 8618 "ConfigurationInterfaces.c" } #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (sort_order) { #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *sort_order = _vala_sort_order; -#line 8561 "ConfigurationInterfaces.c" +#line 8624 "ConfigurationInterfaces.c" } #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (sort_by) { #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *sort_by = _vala_sort_by; -#line 8567 "ConfigurationInterfaces.c" +#line 8630 "ConfigurationInterfaces.c" } } @@ -8578,7 +8641,7 @@ void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gb g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->get_library_photos_sort (self, sort_order, sort_by); -#line 8577 "ConfigurationInterfaces.c" +#line 8640 "ConfigurationInterfaces.c" } @@ -8605,7 +8668,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8604 "ConfigurationInterfaces.c" +#line 8667 "ConfigurationInterfaces.c" goto __catch159_configuration_error; } #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8614,7 +8677,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8613 "ConfigurationInterfaces.c" +#line 8676 "ConfigurationInterfaces.c" } #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_facade_get_engine (self); @@ -8630,7 +8693,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8629 "ConfigurationInterfaces.c" +#line 8692 "ConfigurationInterfaces.c" goto __catch159_configuration_error; } #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8639,7 +8702,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8638 "ConfigurationInterfaces.c" +#line 8701 "ConfigurationInterfaces.c" } } goto __finally159; @@ -8657,7 +8720,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca configuration_facade_on_configuration_error (self, _tmp6_); #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8656 "ConfigurationInterfaces.c" +#line 8719 "ConfigurationInterfaces.c" } __finally159: #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8668,7 +8731,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca g_clear_error (&_inner_error_); #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8667 "ConfigurationInterfaces.c" +#line 8730 "ConfigurationInterfaces.c" } } @@ -8678,7 +8741,7 @@ void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gb g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_library_photos_sort (self, sort_order, sort_by); -#line 8677 "ConfigurationInterfaces.c" +#line 8740 "ConfigurationInterfaces.c" } @@ -8690,7 +8753,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac _vala_maximize = FALSE; #line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" dimensions_init (&_vala_dimensions, 1024, 768); -#line 8689 "ConfigurationInterfaces.c" +#line 8752 "ConfigurationInterfaces.c" { gboolean _tmp0_ = FALSE; ConfigurationEngine* _tmp1_ = NULL; @@ -8725,7 +8788,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8724 "ConfigurationInterfaces.c" +#line 8787 "ConfigurationInterfaces.c" goto __catch160_configuration_error; } #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8734,7 +8797,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8733 "ConfigurationInterfaces.c" +#line 8796 "ConfigurationInterfaces.c" } #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _vala_maximize = _tmp0_; @@ -8754,7 +8817,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8753 "ConfigurationInterfaces.c" +#line 8816 "ConfigurationInterfaces.c" goto __catch160_configuration_error; } #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8763,7 +8826,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8762 "ConfigurationInterfaces.c" +#line 8825 "ConfigurationInterfaces.c" } #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp9_ = configuration_facade_get_engine (self); @@ -8781,7 +8844,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8780 "ConfigurationInterfaces.c" +#line 8843 "ConfigurationInterfaces.c" goto __catch160_configuration_error; } #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8790,7 +8853,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8789 "ConfigurationInterfaces.c" +#line 8852 "ConfigurationInterfaces.c" } #line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp13_ = w; @@ -8798,7 +8861,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac _tmp14_ = h; #line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_); -#line 8797 "ConfigurationInterfaces.c" +#line 8860 "ConfigurationInterfaces.c" } goto __finally160; __catch160_configuration_error: @@ -8815,7 +8878,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac configuration_facade_on_configuration_error (self, _tmp15_); #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8814 "ConfigurationInterfaces.c" +#line 8877 "ConfigurationInterfaces.c" } __finally160: #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8826,19 +8889,19 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8825 "ConfigurationInterfaces.c" +#line 8888 "ConfigurationInterfaces.c" } #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (maximize) { #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *maximize = _vala_maximize; -#line 8831 "ConfigurationInterfaces.c" +#line 8894 "ConfigurationInterfaces.c" } #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (dimensions) { #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" *dimensions = _vala_dimensions; -#line 8837 "ConfigurationInterfaces.c" +#line 8900 "ConfigurationInterfaces.c" } } @@ -8848,7 +8911,7 @@ void configuration_facade_get_library_window_state (ConfigurationFacade* self, g g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->get_library_window_state (self, maximize, dimensions); -#line 8847 "ConfigurationInterfaces.c" +#line 8910 "ConfigurationInterfaces.c" } @@ -8856,7 +8919,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac GError * _inner_error_ = NULL; #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (dimensions != NULL); -#line 8855 "ConfigurationInterfaces.c" +#line 8918 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -8883,7 +8946,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8882 "ConfigurationInterfaces.c" +#line 8945 "ConfigurationInterfaces.c" goto __catch161_configuration_error; } #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8892,7 +8955,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8891 "ConfigurationInterfaces.c" +#line 8954 "ConfigurationInterfaces.c" } #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp3_ = configuration_facade_get_engine (self); @@ -8910,7 +8973,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8909 "ConfigurationInterfaces.c" +#line 8972 "ConfigurationInterfaces.c" goto __catch161_configuration_error; } #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8919,7 +8982,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8918 "ConfigurationInterfaces.c" +#line 8981 "ConfigurationInterfaces.c" } #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp7_ = configuration_facade_get_engine (self); @@ -8937,7 +9000,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 8936 "ConfigurationInterfaces.c" +#line 8999 "ConfigurationInterfaces.c" goto __catch161_configuration_error; } #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8946,7 +9009,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8945 "ConfigurationInterfaces.c" +#line 9008 "ConfigurationInterfaces.c" } } goto __finally161; @@ -8964,7 +9027,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac configuration_facade_on_configuration_error (self, _tmp11_); #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 8963 "ConfigurationInterfaces.c" +#line 9026 "ConfigurationInterfaces.c" } __finally161: #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -8975,7 +9038,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac g_clear_error (&_inner_error_); #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 8974 "ConfigurationInterfaces.c" +#line 9037 "ConfigurationInterfaces.c" } } @@ -8985,12 +9048,13 @@ void configuration_facade_set_library_window_state (ConfigurationFacade* self, g g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_library_window_state (self, maximize, dimensions); -#line 8984 "ConfigurationInterfaces.c" +#line 9047 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_modify_originals (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -9012,9 +9076,11 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac _tmp0_ = _tmp4_; #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 9075 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9013 "ConfigurationInterfaces.c" +#line 9079 "ConfigurationInterfaces.c" goto __catch162_configuration_error; } #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9022,35 +9088,35 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 9022 "ConfigurationInterfaces.c" + return _tmp5_; +#line 9088 "ConfigurationInterfaces.c" } #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9028 "ConfigurationInterfaces.c" +#line 9094 "ConfigurationInterfaces.c" } goto __finally162; __catch162_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9049 "ConfigurationInterfaces.c" +#line 9115 "ConfigurationInterfaces.c" } __finally162: #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9058,8 +9124,8 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 9058 "ConfigurationInterfaces.c" + return _tmp7_; +#line 9124 "ConfigurationInterfaces.c" } @@ -9068,7 +9134,7 @@ gboolean configuration_facade_get_modify_originals (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_modify_originals (self); -#line 9067 "ConfigurationInterfaces.c" +#line 9133 "ConfigurationInterfaces.c" } @@ -9092,7 +9158,7 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9091 "ConfigurationInterfaces.c" +#line 9157 "ConfigurationInterfaces.c" goto __catch163_configuration_error; } #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9101,7 +9167,7 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9100 "ConfigurationInterfaces.c" +#line 9166 "ConfigurationInterfaces.c" } } goto __finally163; @@ -9119,7 +9185,7 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade* configuration_facade_on_configuration_error (self, _tmp3_); #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9118 "ConfigurationInterfaces.c" +#line 9184 "ConfigurationInterfaces.c" } __finally163: #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9130,7 +9196,7 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9129 "ConfigurationInterfaces.c" +#line 9195 "ConfigurationInterfaces.c" } } @@ -9140,12 +9206,13 @@ void configuration_facade_set_modify_originals (ConfigurationFacade* self, gbool g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_modify_originals (self, modify_originals); -#line 9139 "ConfigurationInterfaces.c" +#line 9205 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFacade* self) { gint result = 0; + gint _tmp9_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -9167,9 +9234,11 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa _tmp0_ = _tmp4_; #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 9233 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9168 "ConfigurationInterfaces.c" +#line 9237 "ConfigurationInterfaces.c" goto __catch164_configuration_error; } #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9177,41 +9246,41 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 9177 "ConfigurationInterfaces.c" + return _tmp5_; +#line 9246 "ConfigurationInterfaces.c" } #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9183 "ConfigurationInterfaces.c" +#line 9252 "ConfigurationInterfaces.c" } goto __finally164; __catch164_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; - gint _tmp6_ = 0; + GError* _tmp6_ = NULL; gint _tmp7_ = 0; + gint _tmp8_ = 0; #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = thumbnail_get_DEFAULT_SCALE (); + _tmp7_ = thumbnail_get_DEFAULT_SCALE (); #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = _tmp6_; + _tmp8_ = _tmp7_; #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp7_; + result = _tmp8_; #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9210 "ConfigurationInterfaces.c" +#line 9279 "ConfigurationInterfaces.c" } __finally164: #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9219,8 +9288,8 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 9219 "ConfigurationInterfaces.c" + return _tmp9_; +#line 9288 "ConfigurationInterfaces.c" } @@ -9229,7 +9298,7 @@ gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self) g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_photo_thumbnail_scale (self); -#line 9228 "ConfigurationInterfaces.c" +#line 9297 "ConfigurationInterfaces.c" } @@ -9253,7 +9322,7 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9252 "ConfigurationInterfaces.c" +#line 9321 "ConfigurationInterfaces.c" goto __catch165_configuration_error; } #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9262,7 +9331,7 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa g_clear_error (&_inner_error_); #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9261 "ConfigurationInterfaces.c" +#line 9330 "ConfigurationInterfaces.c" } } goto __finally165; @@ -9280,7 +9349,7 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa configuration_facade_on_configuration_error (self, _tmp3_); #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9279 "ConfigurationInterfaces.c" +#line 9348 "ConfigurationInterfaces.c" } __finally165: #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9291,7 +9360,7 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa g_clear_error (&_inner_error_); #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9290 "ConfigurationInterfaces.c" +#line 9359 "ConfigurationInterfaces.c" } } @@ -9301,12 +9370,13 @@ void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_photo_thumbnail_scale (self, scale); -#line 9300 "ConfigurationInterfaces.c" +#line 9369 "ConfigurationInterfaces.c" } static gdouble configuration_facade_real_get_printing_content_height (ConfigurationFacade* self) { gdouble result = 0.0; + gdouble _tmp7_ = 0.0; GError * _inner_error_ = NULL; { gdouble _tmp0_ = 0.0; @@ -9328,9 +9398,11 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat _tmp0_ = _tmp4_; #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 9397 "ConfigurationInterfaces.c" + gdouble _tmp5_ = 0.0; #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9329 "ConfigurationInterfaces.c" +#line 9401 "ConfigurationInterfaces.c" goto __catch166_configuration_error; } #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9338,35 +9410,35 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0.0; -#line 9338 "ConfigurationInterfaces.c" + return _tmp5_; +#line 9410 "ConfigurationInterfaces.c" } #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9344 "ConfigurationInterfaces.c" +#line 9416 "ConfigurationInterfaces.c" } goto __finally166; __catch166_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 5.0; #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9365 "ConfigurationInterfaces.c" +#line 9437 "ConfigurationInterfaces.c" } __finally166: #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9374,8 +9446,8 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0.0; -#line 9374 "ConfigurationInterfaces.c" + return _tmp7_; +#line 9446 "ConfigurationInterfaces.c" } @@ -9384,7 +9456,7 @@ gdouble configuration_facade_get_printing_content_height (ConfigurationFacade* s g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_height (self); -#line 9383 "ConfigurationInterfaces.c" +#line 9455 "ConfigurationInterfaces.c" } @@ -9408,7 +9480,7 @@ static void configuration_facade_real_set_printing_content_height (Configuration if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9407 "ConfigurationInterfaces.c" +#line 9479 "ConfigurationInterfaces.c" goto __catch167_configuration_error; } #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9417,7 +9489,7 @@ static void configuration_facade_real_set_printing_content_height (Configuration g_clear_error (&_inner_error_); #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9416 "ConfigurationInterfaces.c" +#line 9488 "ConfigurationInterfaces.c" } } goto __finally167; @@ -9435,7 +9507,7 @@ static void configuration_facade_real_set_printing_content_height (Configuration configuration_facade_on_configuration_error (self, _tmp3_); #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9434 "ConfigurationInterfaces.c" +#line 9506 "ConfigurationInterfaces.c" } __finally167: #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9446,7 +9518,7 @@ static void configuration_facade_real_set_printing_content_height (Configuration g_clear_error (&_inner_error_); #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9445 "ConfigurationInterfaces.c" +#line 9517 "ConfigurationInterfaces.c" } } @@ -9456,12 +9528,13 @@ void configuration_facade_set_printing_content_height (ConfigurationFacade* self g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_height (self, content_height); -#line 9455 "ConfigurationInterfaces.c" +#line 9527 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_printing_content_layout (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -9483,9 +9556,11 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration _tmp0_ = _tmp4_; #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 9555 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9484 "ConfigurationInterfaces.c" +#line 9559 "ConfigurationInterfaces.c" goto __catch168_configuration_error; } #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9493,35 +9568,35 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 9493 "ConfigurationInterfaces.c" + return _tmp5_; +#line 9568 "ConfigurationInterfaces.c" } #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_ - 1; #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9499 "ConfigurationInterfaces.c" +#line 9574 "ConfigurationInterfaces.c" } goto __finally168; __catch168_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9520 "ConfigurationInterfaces.c" +#line 9595 "ConfigurationInterfaces.c" } __finally168: #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9529,8 +9604,8 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 9529 "ConfigurationInterfaces.c" + return _tmp7_; +#line 9604 "ConfigurationInterfaces.c" } @@ -9539,7 +9614,7 @@ gint configuration_facade_get_printing_content_layout (ConfigurationFacade* self g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_layout (self); -#line 9538 "ConfigurationInterfaces.c" +#line 9613 "ConfigurationInterfaces.c" } @@ -9563,7 +9638,7 @@ static void configuration_facade_real_set_printing_content_layout (Configuration if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9562 "ConfigurationInterfaces.c" +#line 9637 "ConfigurationInterfaces.c" goto __catch169_configuration_error; } #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9572,7 +9647,7 @@ static void configuration_facade_real_set_printing_content_layout (Configuration g_clear_error (&_inner_error_); #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9571 "ConfigurationInterfaces.c" +#line 9646 "ConfigurationInterfaces.c" } } goto __finally169; @@ -9590,7 +9665,7 @@ static void configuration_facade_real_set_printing_content_layout (Configuration configuration_facade_on_configuration_error (self, _tmp3_); #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9589 "ConfigurationInterfaces.c" +#line 9664 "ConfigurationInterfaces.c" } __finally169: #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9601,7 +9676,7 @@ static void configuration_facade_real_set_printing_content_layout (Configuration g_clear_error (&_inner_error_); #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9600 "ConfigurationInterfaces.c" +#line 9675 "ConfigurationInterfaces.c" } } @@ -9611,12 +9686,13 @@ void configuration_facade_set_printing_content_layout (ConfigurationFacade* self g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_layout (self, layout_code); -#line 9610 "ConfigurationInterfaces.c" +#line 9685 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -9638,9 +9714,11 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac _tmp0_ = _tmp4_; #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 9713 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9639 "ConfigurationInterfaces.c" +#line 9717 "ConfigurationInterfaces.c" goto __catch170_configuration_error; } #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9648,35 +9726,35 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 9648 "ConfigurationInterfaces.c" + return _tmp5_; +#line 9726 "ConfigurationInterfaces.c" } #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9654 "ConfigurationInterfaces.c" +#line 9732 "ConfigurationInterfaces.c" } goto __finally170; __catch170_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 600; #line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9675 "ConfigurationInterfaces.c" +#line 9753 "ConfigurationInterfaces.c" } __finally170: #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9684,8 +9762,8 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 9684 "ConfigurationInterfaces.c" + return _tmp7_; +#line 9762 "ConfigurationInterfaces.c" } @@ -9694,7 +9772,7 @@ gint configuration_facade_get_printing_content_ppi (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_ppi (self); -#line 9693 "ConfigurationInterfaces.c" +#line 9771 "ConfigurationInterfaces.c" } @@ -9718,7 +9796,7 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9717 "ConfigurationInterfaces.c" +#line 9795 "ConfigurationInterfaces.c" goto __catch171_configuration_error; } #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9727,7 +9805,7 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac g_clear_error (&_inner_error_); #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9726 "ConfigurationInterfaces.c" +#line 9804 "ConfigurationInterfaces.c" } } goto __finally171; @@ -9745,7 +9823,7 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac configuration_facade_on_configuration_error (self, _tmp3_); #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9744 "ConfigurationInterfaces.c" +#line 9822 "ConfigurationInterfaces.c" } __finally171: #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9756,7 +9834,7 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac g_clear_error (&_inner_error_); #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9755 "ConfigurationInterfaces.c" +#line 9833 "ConfigurationInterfaces.c" } } @@ -9766,12 +9844,13 @@ void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, g g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_ppi (self, content_ppi); -#line 9765 "ConfigurationInterfaces.c" +#line 9843 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_printing_content_units (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -9793,9 +9872,11 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF _tmp0_ = _tmp4_; #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 9871 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9794 "ConfigurationInterfaces.c" +#line 9875 "ConfigurationInterfaces.c" goto __catch172_configuration_error; } #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9803,35 +9884,35 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 9803 "ConfigurationInterfaces.c" + return _tmp5_; +#line 9884 "ConfigurationInterfaces.c" } #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_ - 1; #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9809 "ConfigurationInterfaces.c" +#line 9890 "ConfigurationInterfaces.c" } goto __finally172; __catch172_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9830 "ConfigurationInterfaces.c" +#line 9911 "ConfigurationInterfaces.c" } __finally172: #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9839,8 +9920,8 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 9839 "ConfigurationInterfaces.c" + return _tmp7_; +#line 9920 "ConfigurationInterfaces.c" } @@ -9849,7 +9930,7 @@ gint configuration_facade_get_printing_content_units (ConfigurationFacade* self) g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_units (self); -#line 9848 "ConfigurationInterfaces.c" +#line 9929 "ConfigurationInterfaces.c" } @@ -9873,7 +9954,7 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9872 "ConfigurationInterfaces.c" +#line 9953 "ConfigurationInterfaces.c" goto __catch173_configuration_error; } #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9882,7 +9963,7 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF g_clear_error (&_inner_error_); #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9881 "ConfigurationInterfaces.c" +#line 9962 "ConfigurationInterfaces.c" } } goto __finally173; @@ -9900,7 +9981,7 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF configuration_facade_on_configuration_error (self, _tmp3_); #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 9899 "ConfigurationInterfaces.c" +#line 9980 "ConfigurationInterfaces.c" } __finally173: #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9911,7 +9992,7 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF g_clear_error (&_inner_error_); #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 9910 "ConfigurationInterfaces.c" +#line 9991 "ConfigurationInterfaces.c" } } @@ -9921,12 +10002,13 @@ void configuration_facade_set_printing_content_units (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_units (self, units_code); -#line 9920 "ConfigurationInterfaces.c" +#line 10001 "ConfigurationInterfaces.c" } static gdouble configuration_facade_real_get_printing_content_width (ConfigurationFacade* self) { gdouble result = 0.0; + gdouble _tmp7_ = 0.0; GError * _inner_error_ = NULL; { gdouble _tmp0_ = 0.0; @@ -9948,9 +10030,11 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati _tmp0_ = _tmp4_; #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 10029 "ConfigurationInterfaces.c" + gdouble _tmp5_ = 0.0; #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 9949 "ConfigurationInterfaces.c" +#line 10033 "ConfigurationInterfaces.c" goto __catch174_configuration_error; } #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9958,35 +10042,35 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0.0; -#line 9958 "ConfigurationInterfaces.c" + return _tmp5_; +#line 10042 "ConfigurationInterfaces.c" } #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9964 "ConfigurationInterfaces.c" +#line 10048 "ConfigurationInterfaces.c" } goto __finally174; __catch174_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 7.0; #line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 9985 "ConfigurationInterfaces.c" +#line 10069 "ConfigurationInterfaces.c" } __finally174: #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -9994,8 +10078,8 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0.0; -#line 9994 "ConfigurationInterfaces.c" + return _tmp7_; +#line 10078 "ConfigurationInterfaces.c" } @@ -10004,7 +10088,7 @@ gdouble configuration_facade_get_printing_content_width (ConfigurationFacade* se g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_width (self); -#line 10003 "ConfigurationInterfaces.c" +#line 10087 "ConfigurationInterfaces.c" } @@ -10028,7 +10112,7 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10027 "ConfigurationInterfaces.c" +#line 10111 "ConfigurationInterfaces.c" goto __catch175_configuration_error; } #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10037,7 +10121,7 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF g_clear_error (&_inner_error_); #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10036 "ConfigurationInterfaces.c" +#line 10120 "ConfigurationInterfaces.c" } } goto __finally175; @@ -10055,7 +10139,7 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF configuration_facade_on_configuration_error (self, _tmp3_); #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10054 "ConfigurationInterfaces.c" +#line 10138 "ConfigurationInterfaces.c" } __finally175: #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10066,7 +10150,7 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF g_clear_error (&_inner_error_); #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10065 "ConfigurationInterfaces.c" +#line 10149 "ConfigurationInterfaces.c" } } @@ -10076,12 +10160,13 @@ void configuration_facade_set_printing_content_width (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_width (self, content_width); -#line 10075 "ConfigurationInterfaces.c" +#line 10159 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_printing_images_per_page (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -10103,9 +10188,11 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio _tmp0_ = _tmp4_; #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 10187 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10104 "ConfigurationInterfaces.c" +#line 10191 "ConfigurationInterfaces.c" goto __catch176_configuration_error; } #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10113,35 +10200,35 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 10113 "ConfigurationInterfaces.c" + return _tmp5_; +#line 10200 "ConfigurationInterfaces.c" } #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_ - 1; #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10119 "ConfigurationInterfaces.c" +#line 10206 "ConfigurationInterfaces.c" } goto __finally176; __catch176_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10140 "ConfigurationInterfaces.c" +#line 10227 "ConfigurationInterfaces.c" } __finally176: #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10149,8 +10236,8 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 10149 "ConfigurationInterfaces.c" + return _tmp7_; +#line 10236 "ConfigurationInterfaces.c" } @@ -10159,7 +10246,7 @@ gint configuration_facade_get_printing_images_per_page (ConfigurationFacade* sel g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_images_per_page (self); -#line 10158 "ConfigurationInterfaces.c" +#line 10245 "ConfigurationInterfaces.c" } @@ -10183,7 +10270,7 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10182 "ConfigurationInterfaces.c" +#line 10269 "ConfigurationInterfaces.c" goto __catch177_configuration_error; } #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10192,7 +10279,7 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio g_clear_error (&_inner_error_); #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10191 "ConfigurationInterfaces.c" +#line 10278 "ConfigurationInterfaces.c" } } goto __finally177; @@ -10210,7 +10297,7 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio configuration_facade_on_configuration_error (self, _tmp3_); #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10209 "ConfigurationInterfaces.c" +#line 10296 "ConfigurationInterfaces.c" } __finally177: #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10221,7 +10308,7 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio g_clear_error (&_inner_error_); #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10220 "ConfigurationInterfaces.c" +#line 10307 "ConfigurationInterfaces.c" } } @@ -10231,12 +10318,13 @@ void configuration_facade_set_printing_images_per_page (ConfigurationFacade* sel g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_images_per_page (self, images_per_page_code); -#line 10230 "ConfigurationInterfaces.c" +#line 10317 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_printing_match_aspect_ratio (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -10258,9 +10346,11 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi _tmp0_ = _tmp4_; #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 10345 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10259 "ConfigurationInterfaces.c" +#line 10349 "ConfigurationInterfaces.c" goto __catch178_configuration_error; } #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10268,35 +10358,35 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 10268 "ConfigurationInterfaces.c" + return _tmp5_; +#line 10358 "ConfigurationInterfaces.c" } #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10274 "ConfigurationInterfaces.c" +#line 10364 "ConfigurationInterfaces.c" } goto __finally178; __catch178_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10295 "ConfigurationInterfaces.c" +#line 10385 "ConfigurationInterfaces.c" } __finally178: #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10304,8 +10394,8 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 10304 "ConfigurationInterfaces.c" + return _tmp7_; +#line 10394 "ConfigurationInterfaces.c" } @@ -10314,7 +10404,7 @@ gboolean configuration_facade_get_printing_match_aspect_ratio (ConfigurationFaca g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_match_aspect_ratio (self); -#line 10313 "ConfigurationInterfaces.c" +#line 10403 "ConfigurationInterfaces.c" } @@ -10338,7 +10428,7 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10337 "ConfigurationInterfaces.c" +#line 10427 "ConfigurationInterfaces.c" goto __catch179_configuration_error; } #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10347,7 +10437,7 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura g_clear_error (&_inner_error_); #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10346 "ConfigurationInterfaces.c" +#line 10436 "ConfigurationInterfaces.c" } } goto __finally179; @@ -10365,7 +10455,7 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura configuration_facade_on_configuration_error (self, _tmp3_); #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10364 "ConfigurationInterfaces.c" +#line 10454 "ConfigurationInterfaces.c" } __finally179: #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10376,7 +10466,7 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura g_clear_error (&_inner_error_); #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10375 "ConfigurationInterfaces.c" +#line 10465 "ConfigurationInterfaces.c" } } @@ -10386,12 +10476,13 @@ void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade* g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_match_aspect_ratio (self, match_aspect_ratio); -#line 10385 "ConfigurationInterfaces.c" +#line 10475 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_printing_print_titles (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -10413,9 +10504,11 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati _tmp0_ = _tmp4_; #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 10503 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10414 "ConfigurationInterfaces.c" +#line 10507 "ConfigurationInterfaces.c" goto __catch180_configuration_error; } #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10423,35 +10516,35 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 10423 "ConfigurationInterfaces.c" + return _tmp5_; +#line 10516 "ConfigurationInterfaces.c" } #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10429 "ConfigurationInterfaces.c" +#line 10522 "ConfigurationInterfaces.c" } goto __finally180; __catch180_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10450 "ConfigurationInterfaces.c" +#line 10543 "ConfigurationInterfaces.c" } __finally180: #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10459,8 +10552,8 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 10459 "ConfigurationInterfaces.c" + return _tmp7_; +#line 10552 "ConfigurationInterfaces.c" } @@ -10469,7 +10562,7 @@ gboolean configuration_facade_get_printing_print_titles (ConfigurationFacade* se g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_print_titles (self); -#line 10468 "ConfigurationInterfaces.c" +#line 10561 "ConfigurationInterfaces.c" } @@ -10493,7 +10586,7 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10492 "ConfigurationInterfaces.c" +#line 10585 "ConfigurationInterfaces.c" goto __catch181_configuration_error; } #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10502,7 +10595,7 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa g_clear_error (&_inner_error_); #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10501 "ConfigurationInterfaces.c" +#line 10594 "ConfigurationInterfaces.c" } } goto __finally181; @@ -10520,7 +10613,7 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa configuration_facade_on_configuration_error (self, _tmp3_); #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10519 "ConfigurationInterfaces.c" +#line 10612 "ConfigurationInterfaces.c" } __finally181: #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10531,7 +10624,7 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa g_clear_error (&_inner_error_); #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10530 "ConfigurationInterfaces.c" +#line 10623 "ConfigurationInterfaces.c" } } @@ -10541,12 +10634,13 @@ void configuration_facade_set_printing_print_titles (ConfigurationFacade* self, g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_print_titles (self, print_titles); -#line 10540 "ConfigurationInterfaces.c" +#line 10633 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_printing_size_selection (ConfigurationFacade* self) { gint result = 0; + gint _tmp9_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -10555,7 +10649,7 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration gint _tmp3_ = 0; gint _tmp4_ = 0; gint val = 0; - gint _tmp5_ = 0; + gint _tmp6_ = 0; #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10570,9 +10664,11 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration _tmp0_ = _tmp4_; #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 10663 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10571 "ConfigurationInterfaces.c" +#line 10667 "ConfigurationInterfaces.c" goto __catch182_configuration_error; } #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10580,56 +10676,56 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 10580 "ConfigurationInterfaces.c" + return _tmp5_; +#line 10676 "ConfigurationInterfaces.c" } #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" val = _tmp0_ - 1; #line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = val; + _tmp6_ = val; #line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - if (_tmp5_ == -2) { -#line 10588 "ConfigurationInterfaces.c" - ResourcesUnitSystem _tmp6_ = 0; + if (_tmp6_ == -2) { +#line 10684 "ConfigurationInterfaces.c" + ResourcesUnitSystem _tmp7_ = 0; #line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp6_ = resources_get_default_measurement_unit (); + _tmp7_ = resources_get_default_measurement_unit (); #line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - if (_tmp6_ == RESOURCES_UNIT_SYSTEM_IMPERIAL) { + if (_tmp7_ == RESOURCES_UNIT_SYSTEM_IMPERIAL) { #line 1521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" val = 2; -#line 10596 "ConfigurationInterfaces.c" +#line 10692 "ConfigurationInterfaces.c" } else { #line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" val = 10; -#line 10600 "ConfigurationInterfaces.c" +#line 10696 "ConfigurationInterfaces.c" } } #line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = val; #line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10607 "ConfigurationInterfaces.c" +#line 10703 "ConfigurationInterfaces.c" } goto __finally182; __catch182_configuration_error: { GError* err = NULL; - GError* _tmp7_ = NULL; + GError* _tmp8_ = NULL; #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = err; + _tmp8_ = err; #line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp7_); + configuration_facade_on_configuration_error (self, _tmp8_); #line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0; #line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10628 "ConfigurationInterfaces.c" +#line 10724 "ConfigurationInterfaces.c" } __finally182: #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10637,8 +10733,8 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 10637 "ConfigurationInterfaces.c" + return _tmp9_; +#line 10733 "ConfigurationInterfaces.c" } @@ -10647,7 +10743,7 @@ gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_size_selection (self); -#line 10646 "ConfigurationInterfaces.c" +#line 10742 "ConfigurationInterfaces.c" } @@ -10671,7 +10767,7 @@ static void configuration_facade_real_set_printing_size_selection (Configuration if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10670 "ConfigurationInterfaces.c" +#line 10766 "ConfigurationInterfaces.c" goto __catch183_configuration_error; } #line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10680,7 +10776,7 @@ static void configuration_facade_real_set_printing_size_selection (Configuration g_clear_error (&_inner_error_); #line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10679 "ConfigurationInterfaces.c" +#line 10775 "ConfigurationInterfaces.c" } } goto __finally183; @@ -10698,7 +10794,7 @@ static void configuration_facade_real_set_printing_size_selection (Configuration configuration_facade_on_configuration_error (self, _tmp3_); #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10697 "ConfigurationInterfaces.c" +#line 10793 "ConfigurationInterfaces.c" } __finally183: #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10709,7 +10805,7 @@ static void configuration_facade_real_set_printing_size_selection (Configuration g_clear_error (&_inner_error_); #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10708 "ConfigurationInterfaces.c" +#line 10804 "ConfigurationInterfaces.c" } } @@ -10719,7 +10815,7 @@ void configuration_facade_set_printing_size_selection (ConfigurationFacade* self g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_size_selection (self, size_code); -#line 10718 "ConfigurationInterfaces.c" +#line 10814 "ConfigurationInterfaces.c" } @@ -10749,7 +10845,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10748 "ConfigurationInterfaces.c" +#line 10844 "ConfigurationInterfaces.c" goto __catch184_configuration_error; } #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10758,7 +10854,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF g_clear_error (&_inner_error_); #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 10757 "ConfigurationInterfaces.c" +#line 10853 "ConfigurationInterfaces.c" } #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -10770,7 +10866,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF _g_free0 (_tmp0_); #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10769 "ConfigurationInterfaces.c" +#line 10865 "ConfigurationInterfaces.c" } goto __finally184; __catch184_configuration_error: @@ -10794,7 +10890,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF _g_error_free0 (err); #line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10793 "ConfigurationInterfaces.c" +#line 10889 "ConfigurationInterfaces.c" } __finally184: #line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10803,7 +10899,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF g_clear_error (&_inner_error_); #line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 10802 "ConfigurationInterfaces.c" +#line 10898 "ConfigurationInterfaces.c" } @@ -10812,7 +10908,7 @@ gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self) g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_titles_font (self); -#line 10811 "ConfigurationInterfaces.c" +#line 10907 "ConfigurationInterfaces.c" } @@ -10820,7 +10916,7 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac GError * _inner_error_ = NULL; #line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (font_name != NULL); -#line 10819 "ConfigurationInterfaces.c" +#line 10915 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -10839,7 +10935,7 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10838 "ConfigurationInterfaces.c" +#line 10934 "ConfigurationInterfaces.c" goto __catch185_configuration_error; } #line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10848,7 +10944,7 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac g_clear_error (&_inner_error_); #line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10847 "ConfigurationInterfaces.c" +#line 10943 "ConfigurationInterfaces.c" } } goto __finally185; @@ -10866,7 +10962,7 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac configuration_facade_on_configuration_error (self, _tmp3_); #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 10865 "ConfigurationInterfaces.c" +#line 10961 "ConfigurationInterfaces.c" } __finally185: #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10877,7 +10973,7 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac g_clear_error (&_inner_error_); #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 10876 "ConfigurationInterfaces.c" +#line 10972 "ConfigurationInterfaces.c" } } @@ -10887,12 +10983,13 @@ void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, c g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_titles_font (self, font_name); -#line 10886 "ConfigurationInterfaces.c" +#line 10982 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_show_welcome_dialog (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -10914,9 +11011,11 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration _tmp0_ = _tmp4_; #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 11010 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10915 "ConfigurationInterfaces.c" +#line 11014 "ConfigurationInterfaces.c" goto __catch186_configuration_error; } #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10924,35 +11023,35 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 10924 "ConfigurationInterfaces.c" + return _tmp5_; +#line 11023 "ConfigurationInterfaces.c" } #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10930 "ConfigurationInterfaces.c" +#line 11029 "ConfigurationInterfaces.c" } goto __finally186; __catch186_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = TRUE; #line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 10951 "ConfigurationInterfaces.c" +#line 11050 "ConfigurationInterfaces.c" } __finally186: #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -10960,8 +11059,8 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 10960 "ConfigurationInterfaces.c" + return _tmp7_; +#line 11059 "ConfigurationInterfaces.c" } @@ -10970,7 +11069,7 @@ gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1570 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_show_welcome_dialog (self); -#line 10969 "ConfigurationInterfaces.c" +#line 11068 "ConfigurationInterfaces.c" } @@ -10994,7 +11093,7 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 10993 "ConfigurationInterfaces.c" +#line 11092 "ConfigurationInterfaces.c" goto __catch187_configuration_error; } #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11003,7 +11102,7 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca g_clear_error (&_inner_error_); #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11002 "ConfigurationInterfaces.c" +#line 11101 "ConfigurationInterfaces.c" } } goto __finally187; @@ -11021,7 +11120,7 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca configuration_facade_on_configuration_error (self, _tmp3_); #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11020 "ConfigurationInterfaces.c" +#line 11119 "ConfigurationInterfaces.c" } __finally187: #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11032,7 +11131,7 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca g_clear_error (&_inner_error_); #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11031 "ConfigurationInterfaces.c" +#line 11130 "ConfigurationInterfaces.c" } } @@ -11042,12 +11141,13 @@ void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gb g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_show_welcome_dialog (self, show); -#line 11041 "ConfigurationInterfaces.c" +#line 11140 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -11069,9 +11169,11 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade* _tmp0_ = _tmp4_; #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 11168 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11070 "ConfigurationInterfaces.c" +#line 11172 "ConfigurationInterfaces.c" goto __catch188_configuration_error; } #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11079,35 +11181,35 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade* #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 11079 "ConfigurationInterfaces.c" + return _tmp5_; +#line 11181 "ConfigurationInterfaces.c" } #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11085 "ConfigurationInterfaces.c" +#line 11187 "ConfigurationInterfaces.c" } goto __finally188; __catch188_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 180; #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11106 "ConfigurationInterfaces.c" +#line 11208 "ConfigurationInterfaces.c" } __finally188: #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11115,8 +11217,8 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade* #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 11115 "ConfigurationInterfaces.c" + return _tmp7_; +#line 11217 "ConfigurationInterfaces.c" } @@ -11125,7 +11227,7 @@ gint configuration_facade_get_sidebar_position (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_sidebar_position (self); -#line 11124 "ConfigurationInterfaces.c" +#line 11226 "ConfigurationInterfaces.c" } @@ -11149,7 +11251,7 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11148 "ConfigurationInterfaces.c" +#line 11250 "ConfigurationInterfaces.c" goto __catch189_configuration_error; } #line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11158,7 +11260,7 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11157 "ConfigurationInterfaces.c" +#line 11259 "ConfigurationInterfaces.c" } } goto __finally189; @@ -11176,7 +11278,7 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* configuration_facade_on_configuration_error (self, _tmp3_); #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11175 "ConfigurationInterfaces.c" +#line 11277 "ConfigurationInterfaces.c" } __finally189: #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11187,7 +11289,7 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11186 "ConfigurationInterfaces.c" +#line 11288 "ConfigurationInterfaces.c" } } @@ -11197,12 +11299,13 @@ void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_sidebar_position (self, position); -#line 11196 "ConfigurationInterfaces.c" +#line 11298 "ConfigurationInterfaces.c" } static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacade* self) { gdouble result = 0.0; + gdouble _tmp7_ = 0.0; GError * _inner_error_ = NULL; { gdouble _tmp0_ = 0.0; @@ -11224,9 +11327,11 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad _tmp0_ = _tmp4_; #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 11326 "ConfigurationInterfaces.c" + gdouble _tmp5_ = 0.0; #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11225 "ConfigurationInterfaces.c" +#line 11330 "ConfigurationInterfaces.c" goto __catch190_configuration_error; } #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11234,35 +11339,35 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0.0; -#line 11234 "ConfigurationInterfaces.c" + return _tmp5_; +#line 11339 "ConfigurationInterfaces.c" } #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11240 "ConfigurationInterfaces.c" +#line 11345 "ConfigurationInterfaces.c" } goto __finally190; __catch190_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 3.0; #line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11261 "ConfigurationInterfaces.c" +#line 11366 "ConfigurationInterfaces.c" } __finally190: #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11270,8 +11375,8 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0.0; -#line 11270 "ConfigurationInterfaces.c" + return _tmp7_; +#line 11375 "ConfigurationInterfaces.c" } @@ -11280,7 +11385,7 @@ gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_delay (self); -#line 11279 "ConfigurationInterfaces.c" +#line 11384 "ConfigurationInterfaces.c" } @@ -11304,7 +11409,7 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11303 "ConfigurationInterfaces.c" +#line 11408 "ConfigurationInterfaces.c" goto __catch191_configuration_error; } #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11313,7 +11418,7 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11312 "ConfigurationInterfaces.c" +#line 11417 "ConfigurationInterfaces.c" } } goto __finally191; @@ -11331,7 +11436,7 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* configuration_facade_on_configuration_error (self, _tmp3_); #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11330 "ConfigurationInterfaces.c" +#line 11435 "ConfigurationInterfaces.c" } __finally191: #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11342,7 +11447,7 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11341 "ConfigurationInterfaces.c" +#line 11446 "ConfigurationInterfaces.c" } } @@ -11352,12 +11457,13 @@ void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdoubl g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_delay (self, delay); -#line 11351 "ConfigurationInterfaces.c" +#line 11456 "ConfigurationInterfaces.c" } static gdouble configuration_facade_real_get_slideshow_transition_delay (ConfigurationFacade* self) { gdouble result = 0.0; + gdouble _tmp7_ = 0.0; GError * _inner_error_ = NULL; { gdouble _tmp0_ = 0.0; @@ -11379,9 +11485,11 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu _tmp0_ = _tmp4_; #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 11484 "ConfigurationInterfaces.c" + gdouble _tmp5_ = 0.0; #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11380 "ConfigurationInterfaces.c" +#line 11488 "ConfigurationInterfaces.c" goto __catch192_configuration_error; } #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11389,35 +11497,35 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0.0; -#line 11389 "ConfigurationInterfaces.c" + return _tmp5_; +#line 11497 "ConfigurationInterfaces.c" } #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11395 "ConfigurationInterfaces.c" +#line 11503 "ConfigurationInterfaces.c" } goto __finally192; __catch192_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = 0.3; #line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11416 "ConfigurationInterfaces.c" +#line 11524 "ConfigurationInterfaces.c" } __finally192: #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11425,8 +11533,8 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0.0; -#line 11425 "ConfigurationInterfaces.c" + return _tmp7_; +#line 11533 "ConfigurationInterfaces.c" } @@ -11435,7 +11543,7 @@ gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_delay (self); -#line 11434 "ConfigurationInterfaces.c" +#line 11542 "ConfigurationInterfaces.c" } @@ -11459,7 +11567,7 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11458 "ConfigurationInterfaces.c" +#line 11566 "ConfigurationInterfaces.c" goto __catch193_configuration_error; } #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11468,7 +11576,7 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat g_clear_error (&_inner_error_); #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11467 "ConfigurationInterfaces.c" +#line 11575 "ConfigurationInterfaces.c" } } goto __finally193; @@ -11486,7 +11594,7 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat configuration_facade_on_configuration_error (self, _tmp3_); #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11485 "ConfigurationInterfaces.c" +#line 11593 "ConfigurationInterfaces.c" } __finally193: #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11497,7 +11605,7 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat g_clear_error (&_inner_error_); #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11496 "ConfigurationInterfaces.c" +#line 11604 "ConfigurationInterfaces.c" } } @@ -11507,7 +11615,7 @@ void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* s g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_delay (self, delay); -#line 11506 "ConfigurationInterfaces.c" +#line 11614 "ConfigurationInterfaces.c" } @@ -11537,7 +11645,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11536 "ConfigurationInterfaces.c" +#line 11644 "ConfigurationInterfaces.c" goto __catch194_configuration_error; } #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11546,7 +11654,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf g_clear_error (&_inner_error_); #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 11545 "ConfigurationInterfaces.c" +#line 11653 "ConfigurationInterfaces.c" } #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp5_ = _tmp0_; @@ -11558,7 +11666,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf _g_free0 (_tmp0_); #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11557 "ConfigurationInterfaces.c" +#line 11665 "ConfigurationInterfaces.c" } goto __finally194; __catch194_configuration_error: @@ -11582,7 +11690,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf _g_error_free0 (err); #line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11581 "ConfigurationInterfaces.c" +#line 11689 "ConfigurationInterfaces.c" } __finally194: #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11591,7 +11699,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf g_clear_error (&_inner_error_); #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return NULL; -#line 11590 "ConfigurationInterfaces.c" +#line 11698 "ConfigurationInterfaces.c" } @@ -11600,7 +11708,7 @@ gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFac g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_effect_id (self); -#line 11599 "ConfigurationInterfaces.c" +#line 11707 "ConfigurationInterfaces.c" } @@ -11608,7 +11716,7 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config GError * _inner_error_ = NULL; #line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_return_if_fail (id != NULL); -#line 11607 "ConfigurationInterfaces.c" +#line 11715 "ConfigurationInterfaces.c" { ConfigurationEngine* _tmp0_ = NULL; ConfigurationEngine* _tmp1_ = NULL; @@ -11627,7 +11735,7 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11626 "ConfigurationInterfaces.c" +#line 11734 "ConfigurationInterfaces.c" goto __catch195_configuration_error; } #line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11636,7 +11744,7 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config g_clear_error (&_inner_error_); #line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11635 "ConfigurationInterfaces.c" +#line 11743 "ConfigurationInterfaces.c" } } goto __finally195; @@ -11654,7 +11762,7 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config configuration_facade_on_configuration_error (self, _tmp3_); #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11653 "ConfigurationInterfaces.c" +#line 11761 "ConfigurationInterfaces.c" } __finally195: #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11665,7 +11773,7 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config g_clear_error (&_inner_error_); #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11664 "ConfigurationInterfaces.c" +#line 11772 "ConfigurationInterfaces.c" } } @@ -11675,12 +11783,13 @@ void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacad g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_effect_id (self, id); -#line 11674 "ConfigurationInterfaces.c" +#line 11782 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_slideshow_show_title (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -11702,9 +11811,11 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio _tmp0_ = _tmp4_; #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 11810 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11703 "ConfigurationInterfaces.c" +#line 11814 "ConfigurationInterfaces.c" goto __catch196_configuration_error; } #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11712,35 +11823,35 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 11712 "ConfigurationInterfaces.c" + return _tmp5_; +#line 11823 "ConfigurationInterfaces.c" } #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11718 "ConfigurationInterfaces.c" +#line 11829 "ConfigurationInterfaces.c" } goto __finally196; __catch196_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11739 "ConfigurationInterfaces.c" +#line 11850 "ConfigurationInterfaces.c" } __finally196: #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11748,8 +11859,8 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 11748 "ConfigurationInterfaces.c" + return _tmp7_; +#line 11859 "ConfigurationInterfaces.c" } @@ -11758,7 +11869,7 @@ gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* sel g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_show_title (self); -#line 11757 "ConfigurationInterfaces.c" +#line 11868 "ConfigurationInterfaces.c" } @@ -11782,7 +11893,7 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11781 "ConfigurationInterfaces.c" +#line 11892 "ConfigurationInterfaces.c" goto __catch197_configuration_error; } #line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11791,7 +11902,7 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac g_clear_error (&_inner_error_); #line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11790 "ConfigurationInterfaces.c" +#line 11901 "ConfigurationInterfaces.c" } } goto __finally197; @@ -11809,7 +11920,7 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac configuration_facade_on_configuration_error (self, _tmp3_); #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 11808 "ConfigurationInterfaces.c" +#line 11919 "ConfigurationInterfaces.c" } __finally197: #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11820,7 +11931,7 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac g_clear_error (&_inner_error_); #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 11819 "ConfigurationInterfaces.c" +#line 11930 "ConfigurationInterfaces.c" } } @@ -11830,7 +11941,7 @@ void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, g g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_show_title (self, show_title); -#line 11829 "ConfigurationInterfaces.c" +#line 11940 "ConfigurationInterfaces.c" } @@ -11845,7 +11956,7 @@ static void g_time_local (time_t time, struct tm* result) { *result = _result_; #line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return; -#line 11844 "ConfigurationInterfaces.c" +#line 11955 "ConfigurationInterfaces.c" } @@ -11891,12 +12002,13 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { buffer = (g_free (buffer), NULL); #line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 11890 "ConfigurationInterfaces.c" +#line 12001 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp12_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -11918,9 +12030,11 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac _tmp0_ = _tmp4_; #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 12029 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 11919 "ConfigurationInterfaces.c" +#line 12033 "ConfigurationInterfaces.c" goto __catch198_configuration_error; } #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11928,52 +12042,52 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 11928 "ConfigurationInterfaces.c" + return _tmp5_; +#line 12042 "ConfigurationInterfaces.c" } #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11934 "ConfigurationInterfaces.c" +#line 12048 "ConfigurationInterfaces.c" } goto __finally198; __catch198_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; - struct tm _tmp6_ = {0}; - gchar* _tmp7_ = NULL; + GError* _tmp6_ = NULL; + struct tm _tmp7_ = {0}; gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + gchar* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; + gboolean _tmp11_ = FALSE; #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - g_time_local ((time_t) 0, &_tmp6_); + g_time_local ((time_t) 0, &_tmp7_); #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp7_ = g_time_format (&_tmp6_, "%p"); + _tmp8_ = g_time_format (&_tmp7_, "%p"); #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp8_ = _tmp7_; + _tmp9_ = _tmp8_; #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp9_ = is_string_empty (_tmp8_); + _tmp10_ = is_string_empty (_tmp9_); #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp10_ = _tmp9_; + _tmp11_ = _tmp10_; #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp9_); #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - result = _tmp10_; + result = _tmp11_; #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 11972 "ConfigurationInterfaces.c" +#line 12086 "ConfigurationInterfaces.c" } __finally198: #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -11981,8 +12095,8 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 11981 "ConfigurationInterfaces.c" + return _tmp12_; +#line 12095 "ConfigurationInterfaces.c" } @@ -11991,7 +12105,7 @@ gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self) { g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_24_hour_time (self); -#line 11990 "ConfigurationInterfaces.c" +#line 12104 "ConfigurationInterfaces.c" } @@ -12015,7 +12129,7 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12014 "ConfigurationInterfaces.c" +#line 12128 "ConfigurationInterfaces.c" goto __catch199_configuration_error; } #line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12024,7 +12138,7 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12023 "ConfigurationInterfaces.c" +#line 12137 "ConfigurationInterfaces.c" } } goto __finally199; @@ -12042,7 +12156,7 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* configuration_facade_on_configuration_error (self, _tmp3_); #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 12041 "ConfigurationInterfaces.c" +#line 12155 "ConfigurationInterfaces.c" } __finally199: #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12053,7 +12167,7 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade* g_clear_error (&_inner_error_); #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12052 "ConfigurationInterfaces.c" +#line 12166 "ConfigurationInterfaces.c" } } @@ -12063,12 +12177,13 @@ void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gbool g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_use_24_hour_time (self, use_24_hour_time); -#line 12062 "ConfigurationInterfaces.c" +#line 12176 "ConfigurationInterfaces.c" } static gboolean configuration_facade_real_get_use_lowercase_filenames (ConfigurationFacade* self) { gboolean result = FALSE; + gboolean _tmp7_ = FALSE; GError * _inner_error_ = NULL; { gboolean _tmp0_ = FALSE; @@ -12090,9 +12205,11 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura _tmp0_ = _tmp4_; #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 12204 "ConfigurationInterfaces.c" + gboolean _tmp5_ = FALSE; #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12091 "ConfigurationInterfaces.c" +#line 12208 "ConfigurationInterfaces.c" goto __catch200_configuration_error; } #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12100,35 +12217,35 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 12100 "ConfigurationInterfaces.c" + return _tmp5_; +#line 12217 "ConfigurationInterfaces.c" } #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12106 "ConfigurationInterfaces.c" +#line 12223 "ConfigurationInterfaces.c" } goto __finally200; __catch200_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = FALSE; #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12127 "ConfigurationInterfaces.c" +#line 12244 "ConfigurationInterfaces.c" } __finally200: #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12136,8 +12253,8 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return FALSE; -#line 12136 "ConfigurationInterfaces.c" + return _tmp7_; +#line 12253 "ConfigurationInterfaces.c" } @@ -12146,7 +12263,7 @@ gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_lowercase_filenames (self); -#line 12145 "ConfigurationInterfaces.c" +#line 12262 "ConfigurationInterfaces.c" } @@ -12170,7 +12287,7 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12169 "ConfigurationInterfaces.c" +#line 12286 "ConfigurationInterfaces.c" goto __catch201_configuration_error; } #line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12179,7 +12296,7 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration g_clear_error (&_inner_error_); #line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12178 "ConfigurationInterfaces.c" +#line 12295 "ConfigurationInterfaces.c" } } goto __finally201; @@ -12197,7 +12314,7 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration configuration_facade_on_configuration_error (self, _tmp3_); #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 12196 "ConfigurationInterfaces.c" +#line 12313 "ConfigurationInterfaces.c" } __finally201: #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12208,7 +12325,7 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration g_clear_error (&_inner_error_); #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12207 "ConfigurationInterfaces.c" +#line 12324 "ConfigurationInterfaces.c" } } @@ -12218,12 +12335,13 @@ void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_use_lowercase_filenames (self, b); -#line 12217 "ConfigurationInterfaces.c" +#line 12334 "ConfigurationInterfaces.c" } static gint configuration_facade_real_get_video_interpreter_state_cookie (ConfigurationFacade* self) { gint result = 0; + gint _tmp7_ = 0; GError * _inner_error_ = NULL; { gint _tmp0_ = 0; @@ -12245,9 +12363,11 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config _tmp0_ = _tmp4_; #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 12362 "ConfigurationInterfaces.c" + gint _tmp5_ = 0; #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12246 "ConfigurationInterfaces.c" +#line 12366 "ConfigurationInterfaces.c" goto __catch202_configuration_error; } #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12255,35 +12375,35 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 12255 "ConfigurationInterfaces.c" + return _tmp5_; +#line 12375 "ConfigurationInterfaces.c" } #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = _tmp0_; #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12261 "ConfigurationInterfaces.c" +#line 12381 "ConfigurationInterfaces.c" } goto __finally202; __catch202_configuration_error: { GError* err = NULL; - GError* _tmp5_ = NULL; + GError* _tmp6_ = NULL; #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" err = _inner_error_; #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _inner_error_ = NULL; #line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - _tmp5_ = err; + _tmp6_ = err; #line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - configuration_facade_on_configuration_error (self, _tmp5_); + configuration_facade_on_configuration_error (self, _tmp6_); #line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" result = -1; #line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); #line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12282 "ConfigurationInterfaces.c" +#line 12402 "ConfigurationInterfaces.c" } __finally202: #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12291,8 +12411,8 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_clear_error (&_inner_error_); #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - return 0; -#line 12291 "ConfigurationInterfaces.c" + return _tmp7_; +#line 12411 "ConfigurationInterfaces.c" } @@ -12301,7 +12421,7 @@ gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacad g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_video_interpreter_state_cookie (self); -#line 12300 "ConfigurationInterfaces.c" +#line 12420 "ConfigurationInterfaces.c" } @@ -12325,7 +12445,7 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" if (_inner_error_->domain == CONFIGURATION_ERROR) { -#line 12324 "ConfigurationInterfaces.c" +#line 12444 "ConfigurationInterfaces.c" goto __catch203_configuration_error; } #line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12334,7 +12454,7 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config g_clear_error (&_inner_error_); #line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12333 "ConfigurationInterfaces.c" +#line 12453 "ConfigurationInterfaces.c" } } goto __finally203; @@ -12352,7 +12472,7 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config configuration_facade_on_configuration_error (self, _tmp3_); #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_error_free0 (err); -#line 12351 "ConfigurationInterfaces.c" +#line 12471 "ConfigurationInterfaces.c" } __finally203: #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -12363,7 +12483,7 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config g_clear_error (&_inner_error_); #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return; -#line 12362 "ConfigurationInterfaces.c" +#line 12482 "ConfigurationInterfaces.c" } } @@ -12373,7 +12493,7 @@ void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacad g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_video_interpreter_state_cookie (self, state_cookie); -#line 12372 "ConfigurationInterfaces.c" +#line 12492 "ConfigurationInterfaces.c" } @@ -12415,7 +12535,7 @@ static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade* result = _tmp7_; #line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12414 "ConfigurationInterfaces.c" +#line 12534 "ConfigurationInterfaces.c" } @@ -12424,7 +12544,7 @@ gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, const g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE); #line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_bool (self, domain, id, key, def); -#line 12423 "ConfigurationInterfaces.c" +#line 12543 "ConfigurationInterfaces.c" } @@ -12457,7 +12577,7 @@ static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self configuration_engine_set_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); #line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 12456 "ConfigurationInterfaces.c" +#line 12576 "ConfigurationInterfaces.c" } @@ -12466,7 +12586,7 @@ void configuration_facade_set_plugin_bool (ConfigurationFacade* self, const gcha g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_bool (self, domain, id, key, val); -#line 12465 "ConfigurationInterfaces.c" +#line 12585 "ConfigurationInterfaces.c" } @@ -12508,7 +12628,7 @@ static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade* result = _tmp7_; #line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12507 "ConfigurationInterfaces.c" +#line 12627 "ConfigurationInterfaces.c" } @@ -12517,7 +12637,7 @@ gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, const g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0); #line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_double (self, domain, id, key, def); -#line 12516 "ConfigurationInterfaces.c" +#line 12636 "ConfigurationInterfaces.c" } @@ -12550,7 +12670,7 @@ static void configuration_facade_real_set_plugin_double (ConfigurationFacade* se configuration_engine_set_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); #line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 12549 "ConfigurationInterfaces.c" +#line 12669 "ConfigurationInterfaces.c" } @@ -12559,7 +12679,7 @@ void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gc g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_double (self, domain, id, key, val); -#line 12558 "ConfigurationInterfaces.c" +#line 12678 "ConfigurationInterfaces.c" } @@ -12601,7 +12721,7 @@ static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self, result = _tmp7_; #line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12600 "ConfigurationInterfaces.c" +#line 12720 "ConfigurationInterfaces.c" } @@ -12610,7 +12730,7 @@ gint configuration_facade_get_plugin_int (ConfigurationFacade* self, const gchar g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_int (self, domain, id, key, def); -#line 12609 "ConfigurationInterfaces.c" +#line 12729 "ConfigurationInterfaces.c" } @@ -12643,7 +12763,7 @@ static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self, configuration_engine_set_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_); #line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 12642 "ConfigurationInterfaces.c" +#line 12762 "ConfigurationInterfaces.c" } @@ -12652,7 +12772,7 @@ void configuration_facade_set_plugin_int (ConfigurationFacade* self, const gchar g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_int (self, domain, id, key, val); -#line 12651 "ConfigurationInterfaces.c" +#line 12771 "ConfigurationInterfaces.c" } @@ -12702,14 +12822,14 @@ static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade* if (g_strcmp0 (_tmp9_, "") == 0) { #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp8_ = NULL; -#line 12701 "ConfigurationInterfaces.c" +#line 12821 "ConfigurationInterfaces.c" } else { const gchar* _tmp10_ = NULL; #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp10_ = _result_; #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp8_ = _tmp10_; -#line 12708 "ConfigurationInterfaces.c" +#line 12828 "ConfigurationInterfaces.c" } #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp11_ = g_strdup (_tmp8_); @@ -12719,7 +12839,7 @@ static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade* _g_free0 (_result_); #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12718 "ConfigurationInterfaces.c" +#line 12838 "ConfigurationInterfaces.c" } @@ -12728,7 +12848,7 @@ gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, const g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL); #line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_string (self, domain, id, key, def); -#line 12727 "ConfigurationInterfaces.c" +#line 12847 "ConfigurationInterfaces.c" } @@ -12752,7 +12872,7 @@ static void configuration_facade_real_set_plugin_string (ConfigurationFacade* se if (_tmp0_ == NULL) { #line 1801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" val = ""; -#line 12751 "ConfigurationInterfaces.c" +#line 12871 "ConfigurationInterfaces.c" } #line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _tmp1_ = configuration_facade_get_engine (self); @@ -12770,7 +12890,7 @@ static void configuration_facade_real_set_plugin_string (ConfigurationFacade* se configuration_engine_set_plugin_string (_tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_); #line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp2_); -#line 12769 "ConfigurationInterfaces.c" +#line 12889 "ConfigurationInterfaces.c" } @@ -12779,7 +12899,7 @@ void configuration_facade_set_plugin_string (ConfigurationFacade* self, const gc g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_string (self, domain, id, key, val); -#line 12778 "ConfigurationInterfaces.c" +#line 12898 "ConfigurationInterfaces.c" } @@ -12809,7 +12929,7 @@ static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* sel configuration_engine_unset_plugin_key (_tmp1_, _tmp2_, _tmp3_, _tmp4_); #line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 12808 "ConfigurationInterfaces.c" +#line 12928 "ConfigurationInterfaces.c" } @@ -12818,7 +12938,7 @@ void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gch g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->unset_plugin_key (self, domain, id, key); -#line 12817 "ConfigurationInterfaces.c" +#line 12937 "ConfigurationInterfaces.c" } @@ -12847,7 +12967,7 @@ static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (Configura result = _tmp4_; #line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return result; -#line 12846 "ConfigurationInterfaces.c" +#line 12966 "ConfigurationInterfaces.c" } @@ -12856,7 +12976,7 @@ FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0); #line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" return CONFIGURATION_FACADE_GET_CLASS (self)->is_plugin_enabled (self, id); -#line 12855 "ConfigurationInterfaces.c" +#line 12975 "ConfigurationInterfaces.c" } @@ -12879,7 +12999,7 @@ static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* s configuration_engine_set_plugin_enabled (_tmp1_, _tmp2_, _tmp3_); #line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" _g_object_unref0 (_tmp1_); -#line 12878 "ConfigurationInterfaces.c" +#line 12998 "ConfigurationInterfaces.c" } @@ -12888,7 +13008,7 @@ void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const g g_return_if_fail (IS_CONFIGURATION_FACADE (self)); #line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_enabled (self, id, enabled); -#line 12887 "ConfigurationInterfaces.c" +#line 13007 "ConfigurationInterfaces.c" } @@ -12898,271 +13018,271 @@ static void configuration_facade_class_init (ConfigurationFacadeClass * klass) { #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_type_class_add_private (klass, sizeof (ConfigurationFacadePrivate)); #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_auto_import_from_library = configuration_facade_real_get_auto_import_from_library; + ((ConfigurationFacadeClass *) klass)->get_auto_import_from_library = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_auto_import_from_library; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_auto_import_from_library = configuration_facade_real_set_auto_import_from_library; + ((ConfigurationFacadeClass *) klass)->set_auto_import_from_library = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_auto_import_from_library; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_bg_color_name = configuration_facade_real_get_bg_color_name; + ((ConfigurationFacadeClass *) klass)->get_bg_color_name = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_bg_color_name; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_bg_color_name = configuration_facade_real_set_bg_color_name; + ((ConfigurationFacadeClass *) klass)->set_bg_color_name = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_bg_color_name; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_commit_metadata_to_masters = configuration_facade_real_get_commit_metadata_to_masters; + ((ConfigurationFacadeClass *) klass)->get_commit_metadata_to_masters = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_commit_metadata_to_masters; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_commit_metadata_to_masters = configuration_facade_real_set_commit_metadata_to_masters; + ((ConfigurationFacadeClass *) klass)->set_commit_metadata_to_masters = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_commit_metadata_to_masters; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_desktop_background = configuration_facade_real_get_desktop_background; + ((ConfigurationFacadeClass *) klass)->get_desktop_background = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_desktop_background; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_desktop_background = configuration_facade_real_set_desktop_background; + ((ConfigurationFacadeClass *) klass)->set_desktop_background = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_desktop_background; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_screensaver = configuration_facade_real_get_screensaver; + ((ConfigurationFacadeClass *) klass)->get_screensaver = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_screensaver; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_screensaver = configuration_facade_real_set_screensaver; + ((ConfigurationFacadeClass *) klass)->set_screensaver = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_screensaver; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_directory_pattern = configuration_facade_real_get_directory_pattern; + ((ConfigurationFacadeClass *) klass)->get_directory_pattern = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_directory_pattern; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_directory_pattern = configuration_facade_real_set_directory_pattern; + ((ConfigurationFacadeClass *) klass)->set_directory_pattern = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_directory_pattern; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_directory_pattern_custom = configuration_facade_real_get_directory_pattern_custom; + ((ConfigurationFacadeClass *) klass)->get_directory_pattern_custom = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_directory_pattern_custom; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_directory_pattern_custom = configuration_facade_real_set_directory_pattern_custom; + ((ConfigurationFacadeClass *) klass)->set_directory_pattern_custom = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_directory_pattern_custom; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_direct_window_state = configuration_facade_real_get_direct_window_state; + ((ConfigurationFacadeClass *) klass)->get_direct_window_state = (void (*)(ConfigurationFacade*, gboolean*, Dimensions*)) configuration_facade_real_get_direct_window_state; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_direct_window_state = configuration_facade_real_set_direct_window_state; + ((ConfigurationFacadeClass *) klass)->set_direct_window_state = (void (*)(ConfigurationFacade*, gboolean, Dimensions*)) configuration_facade_real_set_direct_window_state; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_basic_properties = configuration_facade_real_get_display_basic_properties; + ((ConfigurationFacadeClass *) klass)->get_display_basic_properties = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_basic_properties; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_basic_properties = configuration_facade_real_set_display_basic_properties; + ((ConfigurationFacadeClass *) klass)->set_display_basic_properties = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_basic_properties; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_extended_properties = configuration_facade_real_get_display_extended_properties; + ((ConfigurationFacadeClass *) klass)->get_display_extended_properties = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_extended_properties; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_extended_properties = configuration_facade_real_set_display_extended_properties; + ((ConfigurationFacadeClass *) klass)->set_display_extended_properties = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_extended_properties; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_sidebar = configuration_facade_real_get_display_sidebar; + ((ConfigurationFacadeClass *) klass)->get_display_sidebar = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_sidebar; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_sidebar = configuration_facade_real_set_display_sidebar; + ((ConfigurationFacadeClass *) klass)->set_display_sidebar = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_sidebar; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_toolbar = configuration_facade_real_get_display_toolbar; + ((ConfigurationFacadeClass *) klass)->get_display_toolbar = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_toolbar; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_toolbar = configuration_facade_real_set_display_toolbar; + ((ConfigurationFacadeClass *) klass)->set_display_toolbar = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_toolbar; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_search_bar = configuration_facade_real_get_display_search_bar; + ((ConfigurationFacadeClass *) klass)->get_display_search_bar = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_search_bar; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_search_bar = configuration_facade_real_set_display_search_bar; + ((ConfigurationFacadeClass *) klass)->set_display_search_bar = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_search_bar; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_photo_ratings = configuration_facade_real_get_display_photo_ratings; + ((ConfigurationFacadeClass *) klass)->get_display_photo_ratings = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_photo_ratings; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_photo_ratings = configuration_facade_real_set_display_photo_ratings; + ((ConfigurationFacadeClass *) klass)->set_display_photo_ratings = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_photo_ratings; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_photo_tags = configuration_facade_real_get_display_photo_tags; + ((ConfigurationFacadeClass *) klass)->get_display_photo_tags = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_photo_tags; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_photo_tags = configuration_facade_real_set_display_photo_tags; + ((ConfigurationFacadeClass *) klass)->set_display_photo_tags = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_photo_tags; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_photo_titles = configuration_facade_real_get_display_photo_titles; + ((ConfigurationFacadeClass *) klass)->get_display_photo_titles = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_photo_titles; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_photo_titles = configuration_facade_real_set_display_photo_titles; + ((ConfigurationFacadeClass *) klass)->set_display_photo_titles = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_photo_titles; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_photo_comments = configuration_facade_real_get_display_photo_comments; + ((ConfigurationFacadeClass *) klass)->get_display_photo_comments = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_photo_comments; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_photo_comments = configuration_facade_real_set_display_photo_comments; + ((ConfigurationFacadeClass *) klass)->set_display_photo_comments = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_photo_comments; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_display_event_comments = configuration_facade_real_get_display_event_comments; + ((ConfigurationFacadeClass *) klass)->get_display_event_comments = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_display_event_comments; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_display_event_comments = configuration_facade_real_set_display_event_comments; + ((ConfigurationFacadeClass *) klass)->set_display_event_comments = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_display_event_comments; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_event_photos_sort = configuration_facade_real_get_event_photos_sort; + ((ConfigurationFacadeClass *) klass)->get_event_photos_sort = (void (*)(ConfigurationFacade*, gboolean*, gint*)) configuration_facade_real_get_event_photos_sort; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_event_photos_sort = configuration_facade_real_set_event_photos_sort; + ((ConfigurationFacadeClass *) klass)->set_event_photos_sort = (void (*)(ConfigurationFacade*, gboolean, gint)) configuration_facade_real_set_event_photos_sort; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_events_sort_ascending = configuration_facade_real_get_events_sort_ascending; + ((ConfigurationFacadeClass *) klass)->get_events_sort_ascending = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_events_sort_ascending; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_events_sort_ascending = configuration_facade_real_set_events_sort_ascending; + ((ConfigurationFacadeClass *) klass)->set_events_sort_ascending = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_events_sort_ascending; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_external_photo_app = configuration_facade_real_get_external_photo_app; + ((ConfigurationFacadeClass *) klass)->get_external_photo_app = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_external_photo_app; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_external_photo_app = configuration_facade_real_set_external_photo_app; + ((ConfigurationFacadeClass *) klass)->set_external_photo_app = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_external_photo_app; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_external_raw_app = configuration_facade_real_get_external_raw_app; + ((ConfigurationFacadeClass *) klass)->get_external_raw_app = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_external_raw_app; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_external_raw_app = configuration_facade_real_set_external_raw_app; + ((ConfigurationFacadeClass *) klass)->set_external_raw_app = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_external_raw_app; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_export_constraint = configuration_facade_real_get_export_constraint; + ((ConfigurationFacadeClass *) klass)->get_export_constraint = (ScaleConstraint (*)(ConfigurationFacade*)) configuration_facade_real_get_export_constraint; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_export_constraint = configuration_facade_real_set_export_constraint; + ((ConfigurationFacadeClass *) klass)->set_export_constraint = (void (*)(ConfigurationFacade*, ScaleConstraint)) configuration_facade_real_set_export_constraint; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_export_export_format_mode = configuration_facade_real_get_export_export_format_mode; + ((ConfigurationFacadeClass *) klass)->get_export_export_format_mode = (ExportFormatMode (*)(ConfigurationFacade*)) configuration_facade_real_get_export_export_format_mode; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_export_export_format_mode = configuration_facade_real_set_export_export_format_mode; + ((ConfigurationFacadeClass *) klass)->set_export_export_format_mode = (void (*)(ConfigurationFacade*, ExportFormatMode)) configuration_facade_real_set_export_export_format_mode; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_export_export_metadata = configuration_facade_real_get_export_export_metadata; + ((ConfigurationFacadeClass *) klass)->get_export_export_metadata = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_export_export_metadata; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_export_export_metadata = configuration_facade_real_set_export_export_metadata; + ((ConfigurationFacadeClass *) klass)->set_export_export_metadata = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_export_export_metadata; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_export_photo_file_format = configuration_facade_real_get_export_photo_file_format; + ((ConfigurationFacadeClass *) klass)->get_export_photo_file_format = (PhotoFileFormat (*)(ConfigurationFacade*)) configuration_facade_real_get_export_photo_file_format; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_export_photo_file_format = configuration_facade_real_set_export_photo_file_format; + ((ConfigurationFacadeClass *) klass)->set_export_photo_file_format = (void (*)(ConfigurationFacade*, PhotoFileFormat)) configuration_facade_real_set_export_photo_file_format; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_export_quality = configuration_facade_real_get_export_quality; + ((ConfigurationFacadeClass *) klass)->get_export_quality = (JpegQuality (*)(ConfigurationFacade*)) configuration_facade_real_get_export_quality; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_export_quality = configuration_facade_real_set_export_quality; + ((ConfigurationFacadeClass *) klass)->set_export_quality = (void (*)(ConfigurationFacade*, JpegQuality)) configuration_facade_real_set_export_quality; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_export_scale = configuration_facade_real_get_export_scale; + ((ConfigurationFacadeClass *) klass)->get_export_scale = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_export_scale; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_export_scale = configuration_facade_real_set_export_scale; + ((ConfigurationFacadeClass *) klass)->set_export_scale = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_export_scale; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_default_raw_developer = configuration_facade_real_get_default_raw_developer; + ((ConfigurationFacadeClass *) klass)->get_default_raw_developer = (RawDeveloper (*)(ConfigurationFacade*)) configuration_facade_real_get_default_raw_developer; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_default_raw_developer = configuration_facade_real_set_default_raw_developer; + ((ConfigurationFacadeClass *) klass)->set_default_raw_developer = (void (*)(ConfigurationFacade*, RawDeveloper)) configuration_facade_real_set_default_raw_developer; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_hide_photos_already_imported = configuration_facade_real_get_hide_photos_already_imported; + ((ConfigurationFacadeClass *) klass)->get_hide_photos_already_imported = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_hide_photos_already_imported; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_hide_photos_already_imported = configuration_facade_real_set_hide_photos_already_imported; + ((ConfigurationFacadeClass *) klass)->set_hide_photos_already_imported = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_hide_photos_already_imported; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_import_dir = configuration_facade_real_get_import_dir; + ((ConfigurationFacadeClass *) klass)->get_import_dir = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_import_dir; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_import_dir = configuration_facade_real_set_import_dir; + ((ConfigurationFacadeClass *) klass)->set_import_dir = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_import_dir; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_keep_relativity = configuration_facade_real_get_keep_relativity; + ((ConfigurationFacadeClass *) klass)->get_keep_relativity = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_keep_relativity; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_keep_relativity = configuration_facade_real_set_keep_relativity; + ((ConfigurationFacadeClass *) klass)->set_keep_relativity = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_keep_relativity; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_pin_toolbar_state = configuration_facade_real_get_pin_toolbar_state; + ((ConfigurationFacadeClass *) klass)->get_pin_toolbar_state = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_pin_toolbar_state; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_pin_toolbar_state = configuration_facade_real_set_pin_toolbar_state; + ((ConfigurationFacadeClass *) klass)->set_pin_toolbar_state = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_pin_toolbar_state; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_last_crop_height = configuration_facade_real_get_last_crop_height; + ((ConfigurationFacadeClass *) klass)->get_last_crop_height = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_last_crop_height; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_last_crop_height = configuration_facade_real_set_last_crop_height; + ((ConfigurationFacadeClass *) klass)->set_last_crop_height = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_last_crop_height; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_last_crop_menu_choice = configuration_facade_real_get_last_crop_menu_choice; + ((ConfigurationFacadeClass *) klass)->get_last_crop_menu_choice = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_last_crop_menu_choice; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_last_crop_menu_choice = configuration_facade_real_set_last_crop_menu_choice; + ((ConfigurationFacadeClass *) klass)->set_last_crop_menu_choice = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_last_crop_menu_choice; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_last_crop_width = configuration_facade_real_get_last_crop_width; + ((ConfigurationFacadeClass *) klass)->get_last_crop_width = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_last_crop_width; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_last_crop_width = configuration_facade_real_set_last_crop_width; + ((ConfigurationFacadeClass *) klass)->set_last_crop_width = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_last_crop_width; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_last_used_service = configuration_facade_real_get_last_used_service; + ((ConfigurationFacadeClass *) klass)->get_last_used_service = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_last_used_service; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_last_used_service = configuration_facade_real_set_last_used_service; + ((ConfigurationFacadeClass *) klass)->set_last_used_service = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_last_used_service; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_last_used_dataimports_service = configuration_facade_real_get_last_used_dataimports_service; + ((ConfigurationFacadeClass *) klass)->get_last_used_dataimports_service = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_last_used_dataimports_service; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_last_used_dataimports_service = configuration_facade_real_set_last_used_dataimports_service; + ((ConfigurationFacadeClass *) klass)->set_last_used_dataimports_service = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_last_used_dataimports_service; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_library_photos_sort = configuration_facade_real_get_library_photos_sort; + ((ConfigurationFacadeClass *) klass)->get_library_photos_sort = (void (*)(ConfigurationFacade*, gboolean*, gint*)) configuration_facade_real_get_library_photos_sort; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_library_photos_sort = configuration_facade_real_set_library_photos_sort; + ((ConfigurationFacadeClass *) klass)->set_library_photos_sort = (void (*)(ConfigurationFacade*, gboolean, gint)) configuration_facade_real_set_library_photos_sort; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_library_window_state = configuration_facade_real_get_library_window_state; + ((ConfigurationFacadeClass *) klass)->get_library_window_state = (void (*)(ConfigurationFacade*, gboolean*, Dimensions*)) configuration_facade_real_get_library_window_state; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_library_window_state = configuration_facade_real_set_library_window_state; + ((ConfigurationFacadeClass *) klass)->set_library_window_state = (void (*)(ConfigurationFacade*, gboolean, Dimensions*)) configuration_facade_real_set_library_window_state; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_modify_originals = configuration_facade_real_get_modify_originals; + ((ConfigurationFacadeClass *) klass)->get_modify_originals = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_modify_originals; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_modify_originals = configuration_facade_real_set_modify_originals; + ((ConfigurationFacadeClass *) klass)->set_modify_originals = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_modify_originals; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_photo_thumbnail_scale = configuration_facade_real_get_photo_thumbnail_scale; + ((ConfigurationFacadeClass *) klass)->get_photo_thumbnail_scale = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_photo_thumbnail_scale; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_photo_thumbnail_scale = configuration_facade_real_set_photo_thumbnail_scale; + ((ConfigurationFacadeClass *) klass)->set_photo_thumbnail_scale = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_photo_thumbnail_scale; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_content_height = configuration_facade_real_get_printing_content_height; + ((ConfigurationFacadeClass *) klass)->get_printing_content_height = (gdouble (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_height; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_content_height = configuration_facade_real_set_printing_content_height; + ((ConfigurationFacadeClass *) klass)->set_printing_content_height = (void (*)(ConfigurationFacade*, gdouble)) configuration_facade_real_set_printing_content_height; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_content_layout = configuration_facade_real_get_printing_content_layout; + ((ConfigurationFacadeClass *) klass)->get_printing_content_layout = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_layout; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_content_layout = configuration_facade_real_set_printing_content_layout; + ((ConfigurationFacadeClass *) klass)->set_printing_content_layout = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_content_layout; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_content_ppi = configuration_facade_real_get_printing_content_ppi; + ((ConfigurationFacadeClass *) klass)->get_printing_content_ppi = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_ppi; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_content_ppi = configuration_facade_real_set_printing_content_ppi; + ((ConfigurationFacadeClass *) klass)->set_printing_content_ppi = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_content_ppi; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_content_units = configuration_facade_real_get_printing_content_units; + ((ConfigurationFacadeClass *) klass)->get_printing_content_units = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_units; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_content_units = configuration_facade_real_set_printing_content_units; + ((ConfigurationFacadeClass *) klass)->set_printing_content_units = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_content_units; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_content_width = configuration_facade_real_get_printing_content_width; + ((ConfigurationFacadeClass *) klass)->get_printing_content_width = (gdouble (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_content_width; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_content_width = configuration_facade_real_set_printing_content_width; + ((ConfigurationFacadeClass *) klass)->set_printing_content_width = (void (*)(ConfigurationFacade*, gdouble)) configuration_facade_real_set_printing_content_width; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_images_per_page = configuration_facade_real_get_printing_images_per_page; + ((ConfigurationFacadeClass *) klass)->get_printing_images_per_page = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_images_per_page; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_images_per_page = configuration_facade_real_set_printing_images_per_page; + ((ConfigurationFacadeClass *) klass)->set_printing_images_per_page = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_images_per_page; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_match_aspect_ratio = configuration_facade_real_get_printing_match_aspect_ratio; + ((ConfigurationFacadeClass *) klass)->get_printing_match_aspect_ratio = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_match_aspect_ratio; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_match_aspect_ratio = configuration_facade_real_set_printing_match_aspect_ratio; + ((ConfigurationFacadeClass *) klass)->set_printing_match_aspect_ratio = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_printing_match_aspect_ratio; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_print_titles = configuration_facade_real_get_printing_print_titles; + ((ConfigurationFacadeClass *) klass)->get_printing_print_titles = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_print_titles; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_print_titles = configuration_facade_real_set_printing_print_titles; + ((ConfigurationFacadeClass *) klass)->set_printing_print_titles = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_printing_print_titles; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_size_selection = configuration_facade_real_get_printing_size_selection; + ((ConfigurationFacadeClass *) klass)->get_printing_size_selection = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_size_selection; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_size_selection = configuration_facade_real_set_printing_size_selection; + ((ConfigurationFacadeClass *) klass)->set_printing_size_selection = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_printing_size_selection; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_printing_titles_font = configuration_facade_real_get_printing_titles_font; + ((ConfigurationFacadeClass *) klass)->get_printing_titles_font = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_printing_titles_font; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_printing_titles_font = configuration_facade_real_set_printing_titles_font; + ((ConfigurationFacadeClass *) klass)->set_printing_titles_font = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_printing_titles_font; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_show_welcome_dialog = configuration_facade_real_get_show_welcome_dialog; + ((ConfigurationFacadeClass *) klass)->get_show_welcome_dialog = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_show_welcome_dialog; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_show_welcome_dialog = configuration_facade_real_set_show_welcome_dialog; + ((ConfigurationFacadeClass *) klass)->set_show_welcome_dialog = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_show_welcome_dialog; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_sidebar_position = configuration_facade_real_get_sidebar_position; + ((ConfigurationFacadeClass *) klass)->get_sidebar_position = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_sidebar_position; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_sidebar_position = configuration_facade_real_set_sidebar_position; + ((ConfigurationFacadeClass *) klass)->set_sidebar_position = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_sidebar_position; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_slideshow_delay = configuration_facade_real_get_slideshow_delay; + ((ConfigurationFacadeClass *) klass)->get_slideshow_delay = (gdouble (*)(ConfigurationFacade*)) configuration_facade_real_get_slideshow_delay; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_slideshow_delay = configuration_facade_real_set_slideshow_delay; + ((ConfigurationFacadeClass *) klass)->set_slideshow_delay = (void (*)(ConfigurationFacade*, gdouble)) configuration_facade_real_set_slideshow_delay; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_slideshow_transition_delay = configuration_facade_real_get_slideshow_transition_delay; + ((ConfigurationFacadeClass *) klass)->get_slideshow_transition_delay = (gdouble (*)(ConfigurationFacade*)) configuration_facade_real_get_slideshow_transition_delay; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_slideshow_transition_delay = configuration_facade_real_set_slideshow_transition_delay; + ((ConfigurationFacadeClass *) klass)->set_slideshow_transition_delay = (void (*)(ConfigurationFacade*, gdouble)) configuration_facade_real_set_slideshow_transition_delay; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_slideshow_transition_effect_id = configuration_facade_real_get_slideshow_transition_effect_id; + ((ConfigurationFacadeClass *) klass)->get_slideshow_transition_effect_id = (gchar* (*)(ConfigurationFacade*)) configuration_facade_real_get_slideshow_transition_effect_id; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_slideshow_transition_effect_id = configuration_facade_real_set_slideshow_transition_effect_id; + ((ConfigurationFacadeClass *) klass)->set_slideshow_transition_effect_id = (void (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_set_slideshow_transition_effect_id; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_slideshow_show_title = configuration_facade_real_get_slideshow_show_title; + ((ConfigurationFacadeClass *) klass)->get_slideshow_show_title = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_slideshow_show_title; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_slideshow_show_title = configuration_facade_real_set_slideshow_show_title; + ((ConfigurationFacadeClass *) klass)->set_slideshow_show_title = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_slideshow_show_title; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_use_24_hour_time = configuration_facade_real_get_use_24_hour_time; + ((ConfigurationFacadeClass *) klass)->get_use_24_hour_time = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_use_24_hour_time; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_use_24_hour_time = configuration_facade_real_set_use_24_hour_time; + ((ConfigurationFacadeClass *) klass)->set_use_24_hour_time = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_use_24_hour_time; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_use_lowercase_filenames = configuration_facade_real_get_use_lowercase_filenames; + ((ConfigurationFacadeClass *) klass)->get_use_lowercase_filenames = (gboolean (*)(ConfigurationFacade*)) configuration_facade_real_get_use_lowercase_filenames; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_use_lowercase_filenames = configuration_facade_real_set_use_lowercase_filenames; + ((ConfigurationFacadeClass *) klass)->set_use_lowercase_filenames = (void (*)(ConfigurationFacade*, gboolean)) configuration_facade_real_set_use_lowercase_filenames; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_video_interpreter_state_cookie = configuration_facade_real_get_video_interpreter_state_cookie; + ((ConfigurationFacadeClass *) klass)->get_video_interpreter_state_cookie = (gint (*)(ConfigurationFacade*)) configuration_facade_real_get_video_interpreter_state_cookie; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_video_interpreter_state_cookie = configuration_facade_real_set_video_interpreter_state_cookie; + ((ConfigurationFacadeClass *) klass)->set_video_interpreter_state_cookie = (void (*)(ConfigurationFacade*, gint)) configuration_facade_real_set_video_interpreter_state_cookie; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_plugin_bool = configuration_facade_real_get_plugin_bool; + ((ConfigurationFacadeClass *) klass)->get_plugin_bool = (gboolean (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gboolean)) configuration_facade_real_get_plugin_bool; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_plugin_bool = configuration_facade_real_set_plugin_bool; + ((ConfigurationFacadeClass *) klass)->set_plugin_bool = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gboolean)) configuration_facade_real_set_plugin_bool; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_plugin_double = configuration_facade_real_get_plugin_double; + ((ConfigurationFacadeClass *) klass)->get_plugin_double = (gdouble (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gdouble)) configuration_facade_real_get_plugin_double; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_plugin_double = configuration_facade_real_set_plugin_double; + ((ConfigurationFacadeClass *) klass)->set_plugin_double = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gdouble)) configuration_facade_real_set_plugin_double; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_plugin_int = configuration_facade_real_get_plugin_int; + ((ConfigurationFacadeClass *) klass)->get_plugin_int = (gint (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gint)) configuration_facade_real_get_plugin_int; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_plugin_int = configuration_facade_real_set_plugin_int; + ((ConfigurationFacadeClass *) klass)->set_plugin_int = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, gint)) configuration_facade_real_set_plugin_int; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->get_plugin_string = configuration_facade_real_get_plugin_string; + ((ConfigurationFacadeClass *) klass)->get_plugin_string = (gchar* (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_get_plugin_string; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_plugin_string = configuration_facade_real_set_plugin_string; + ((ConfigurationFacadeClass *) klass)->set_plugin_string = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_set_plugin_string; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->unset_plugin_key = configuration_facade_real_unset_plugin_key; + ((ConfigurationFacadeClass *) klass)->unset_plugin_key = (void (*)(ConfigurationFacade*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_unset_plugin_key; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->is_plugin_enabled = configuration_facade_real_is_plugin_enabled; + ((ConfigurationFacadeClass *) klass)->is_plugin_enabled = (FuzzyPropertyState (*)(ConfigurationFacade*, const gchar*)) configuration_facade_real_is_plugin_enabled; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" - ((ConfigurationFacadeClass *) klass)->set_plugin_enabled = configuration_facade_real_set_plugin_enabled; + ((ConfigurationFacadeClass *) klass)->set_plugin_enabled = (void (*)(ConfigurationFacade*, const gchar*, gboolean)) configuration_facade_real_set_plugin_enabled; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" G_OBJECT_CLASS (klass)->finalize = configuration_facade_finalize; #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" @@ -13177,14 +13297,14 @@ static void configuration_facade_class_init (ConfigurationFacadeClass * klass) { g_signal_new ("external_app_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" g_signal_new ("import_directory_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 13176 "ConfigurationInterfaces.c" +#line 13296 "ConfigurationInterfaces.c" } static void configuration_facade_instance_init (ConfigurationFacade * self) { #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" self->priv = CONFIGURATION_FACADE_GET_PRIVATE (self); -#line 13183 "ConfigurationInterfaces.c" +#line 13303 "ConfigurationInterfaces.c" } @@ -13196,7 +13316,7 @@ static void configuration_facade_finalize (GObject* obj) { _g_object_unref0 (self->priv->engine); #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala" G_OBJECT_CLASS (configuration_facade_parent_class)->finalize (obj); -#line 13195 "ConfigurationInterfaces.c" +#line 13315 "ConfigurationInterfaces.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" } |