diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
| commit | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch) | |
| tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/AppDirs.c | |
| parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
| parent | ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff) | |
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/AppDirs.c')
| -rw-r--r-- | src/AppDirs.c | 1362 |
1 files changed, 666 insertions, 696 deletions
diff --git a/src/AppDirs.c b/src/AppDirs.c index 8f16665..e305d97 100644 --- a/src/AppDirs.c +++ b/src/AppDirs.c @@ -1,4 +1,4 @@ -/* AppDirs.c generated by valac 0.34.7, the Vala compiler +/* AppDirs.c generated by valac 0.36.6, the Vala compiler * generated from AppDirs.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -138,19 +138,19 @@ GFile* app_dirs_get_thumbnailer_bin (void); GFile* app_dirs_get_settings_migrator_bin (void); AppDirs* app_dirs_new (void); AppDirs* app_dirs_construct (GType object_type); -static void app_dirs_finalize (AppDirs* obj); +static void app_dirs_finalize (AppDirs * obj); void app_dirs_init (const gchar* arg0) { GFile* exec_file = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; #line 16 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (arg0 != NULL); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -191,8 +191,8 @@ void app_dirs_terminate (void) { GFile* app_dirs_get_home_dir (void) { GFile* result = NULL; - const gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + const gchar* _tmp0_; + GFile* _tmp1_; #line 27 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = g_get_home_dir (); #line 27 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -215,16 +215,16 @@ static gpointer _g_object_ref0 (gpointer self) { GFile* app_dirs_get_cache_dir (void) { GFile* result = NULL; GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp1_; #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = app_dirs_data_dir; #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp1_ == NULL) { #line 224 "AppDirs.c" - const gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + const gchar* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; #line 32 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_get_user_cache_dir (); #line 32 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -241,8 +241,8 @@ GFile* app_dirs_get_cache_dir (void) { _g_object_unref0 (_tmp4_); #line 243 "AppDirs.c" } else { - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; + GFile* _tmp6_; + GFile* _tmp7_; #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = app_dirs_data_dir; #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -263,58 +263,58 @@ GFile* app_dirs_get_cache_dir (void) { void app_dirs_try_migrate_data (void) { GFile* user_plugin_dir = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; GFile* old_dir = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; + GFile* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; gboolean _tmp9_ = FALSE; - GFile* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GFile* _tmp10_; + gboolean _tmp11_; GFile* new_dir = NULL; - GFile* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; - GFile* _tmp24_ = NULL; + GFile* _tmp21_; + GFile* _tmp22_; + GFile* _tmp23_; + GFile* _tmp24_; gboolean _tmp25_ = FALSE; - GFile* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; + GFile* _tmp26_; + gboolean _tmp27_; GFile* cache_dir = NULL; - GFile* _tmp30_ = NULL; + GFile* _tmp30_; mode_t mask = {0}; - mode_t _tmp31_ = {0}; - GFile* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; - GFile* _tmp43_ = NULL; - GFile* _tmp44_ = NULL; - GFile* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - GFile* _tmp48_ = NULL; - GFile* _tmp49_ = NULL; - GFile* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - GFile* _tmp53_ = NULL; - GFile* _tmp54_ = NULL; - GFile* _tmp55_ = NULL; - gboolean _tmp56_ = FALSE; - gboolean _tmp57_ = FALSE; - GFile* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; - GFile* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; - GFile* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; - gchar* _tmp79_ = NULL; - mode_t _tmp80_ = {0}; + mode_t _tmp31_; + GFile* _tmp32_; + gboolean _tmp33_; + GFile* _tmp42_; + GFile* _tmp43_; + GFile* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + GFile* _tmp47_; + GFile* _tmp48_; + GFile* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + GFile* _tmp52_; + GFile* _tmp53_; + GFile* _tmp54_; + gboolean _tmp55_; + gboolean _tmp56_; + GFile* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; + GFile* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; + GFile* _tmp75_; + gchar* _tmp76_; + gchar* _tmp77_; + mode_t _tmp78_; GError * _inner_error_ = NULL; #line 38 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_user_plugins_dir (); @@ -351,10 +351,10 @@ void app_dirs_try_migrate_data (void) { #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp11_) { #line 354 "AppDirs.c" - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + GFile* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; + gboolean _tmp15_; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp12_ = user_plugin_dir; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -377,9 +377,9 @@ void app_dirs_try_migrate_data (void) { if (_tmp9_) { #line 379 "AppDirs.c" { - GFile* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; + GFile* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp16_ = user_plugin_dir; #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -393,11 +393,11 @@ void app_dirs_try_migrate_data (void) { #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 396 "AppDirs.c" - goto __catch443_g_error; + goto __catch444_g_error; } } - goto __finally443; - __catch443_g_error: + goto __finally444; + __catch444_g_error: { GError* err = NULL; #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -408,7 +408,7 @@ void app_dirs_try_migrate_data (void) { _g_error_free0 (err); #line 410 "AppDirs.c" } - __finally443: + __finally444: #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -425,8 +425,8 @@ void app_dirs_try_migrate_data (void) { } } { - GFile* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; + GFile* _tmp19_; + GFile* _tmp20_; #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp19_ = old_dir; #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -436,11 +436,11 @@ void app_dirs_try_migrate_data (void) { #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 439 "AppDirs.c" - goto __catch444_g_error; + goto __catch445_g_error; } } - goto __finally444; - __catch444_g_error: + goto __finally445; + __catch445_g_error: { GError* err = NULL; #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -451,7 +451,7 @@ void app_dirs_try_migrate_data (void) { _g_error_free0 (err); #line 453 "AppDirs.c" } - __finally444: + __finally445: #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -492,8 +492,8 @@ void app_dirs_try_migrate_data (void) { _tmp25_ = TRUE; #line 494 "AppDirs.c" } else { - GFile* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; + GFile* _tmp28_; + gboolean _tmp29_; #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp28_ = old_dir; #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -530,7 +530,7 @@ void app_dirs_try_migrate_data (void) { if (!_tmp33_) { #line 532 "AppDirs.c" { - GFile* _tmp34_ = NULL; + GFile* _tmp34_; #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp34_ = cache_dir; #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -538,52 +538,49 @@ void app_dirs_try_migrate_data (void) { #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 541 "AppDirs.c" - goto __catch445_g_error; + goto __catch446_g_error; } } - goto __finally445; - __catch445_g_error: + goto __finally446; + __catch446_g_error: { GError* err = NULL; - const gchar* _tmp35_ = NULL; - GFile* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - GError* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; + GFile* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + GError* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp35_ = _ ("Unable to create cache directory %s: %s"); -#line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp36_ = cache_dir; + _tmp35_ = cache_dir; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp37_ = g_file_get_path (_tmp36_); + _tmp36_ = g_file_get_path (_tmp35_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp38_ = _tmp37_; + _tmp37_ = _tmp36_; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp39_ = err; + _tmp38_ = err; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp40_ = _tmp39_->message; + _tmp39_ = _tmp38_->message; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp41_ = g_strdup_printf (_tmp35_, _tmp38_, _tmp40_); + _tmp40_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp37_, _tmp39_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp42_ = _tmp41_; + _tmp41_ = _tmp40_; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp42_); + app_window_panic (_tmp41_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp42_); + _g_free0 (_tmp41_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp37_); #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 585 "AppDirs.c" +#line 582 "AppDirs.c" } - __finally445: + __finally446: #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -600,125 +597,122 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 604 "AppDirs.c" +#line 601 "AppDirs.c" } } #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp43_ = old_dir; + _tmp42_ = old_dir; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp44_ = g_file_get_child (_tmp43_, "thumbs"); + _tmp43_ = g_file_get_child (_tmp42_, "thumbs"); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp45_ = _tmp44_; + _tmp44_ = _tmp43_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp46_ = g_file_get_path (_tmp45_); + _tmp45_ = g_file_get_path (_tmp44_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp47_ = _tmp46_; + _tmp46_ = _tmp45_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp48_ = cache_dir; + _tmp47_ = cache_dir; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp49_ = g_file_get_child (_tmp48_, "thumbs"); + _tmp48_ = g_file_get_child (_tmp47_, "thumbs"); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp50_ = _tmp49_; + _tmp49_ = _tmp48_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp51_ = g_file_get_path (_tmp50_); + _tmp50_ = g_file_get_path (_tmp49_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp52_ = _tmp51_; + _tmp51_ = _tmp50_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_rename (_tmp47_, _tmp52_); + g_rename (_tmp46_, _tmp51_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp52_); + _g_free0 (_tmp51_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp50_); + _g_object_unref0 (_tmp49_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp46_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp45_); + _g_object_unref0 (_tmp44_); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp53_ = new_dir; + _tmp52_ = new_dir; #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp54_ = g_file_get_parent (_tmp53_); + _tmp53_ = g_file_get_parent (_tmp52_); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp55_ = _tmp54_; + _tmp54_ = _tmp53_; #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp56_ = g_file_query_exists (_tmp55_, NULL); + _tmp55_ = g_file_query_exists (_tmp54_, NULL); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp57_ = !_tmp56_; + _tmp56_ = !_tmp55_; #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp55_); + _g_object_unref0 (_tmp54_); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp57_) { -#line 651 "AppDirs.c" + if (_tmp56_) { +#line 648 "AppDirs.c" { - GFile* _tmp58_ = NULL; - GFile* _tmp59_ = NULL; - GFile* _tmp60_ = NULL; + GFile* _tmp57_; + GFile* _tmp58_; + GFile* _tmp59_; #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp58_ = new_dir; + _tmp57_ = new_dir; #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp59_ = g_file_get_parent (_tmp58_); + _tmp58_ = g_file_get_parent (_tmp57_); #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp60_ = _tmp59_; + _tmp59_ = _tmp58_; #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp60_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp59_, NULL, &_inner_error_); #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp60_); + _g_object_unref0 (_tmp59_); #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 668 "AppDirs.c" - goto __catch446_g_error; +#line 665 "AppDirs.c" + goto __catch447_g_error; } } - goto __finally446; - __catch446_g_error: + goto __finally447; + __catch447_g_error: { GError* err = NULL; - const gchar* _tmp61_ = NULL; - GFile* _tmp62_ = NULL; - GFile* _tmp63_ = NULL; - GFile* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - GError* _tmp67_ = NULL; - const gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; + GFile* _tmp60_; + GFile* _tmp61_; + GFile* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + GError* _tmp65_; + const gchar* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp61_ = _ ("Unable to create data directory %s: %s"); -#line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp62_ = new_dir; + _tmp60_ = new_dir; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp63_ = g_file_get_parent (_tmp62_); + _tmp61_ = g_file_get_parent (_tmp60_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp64_ = _tmp63_; + _tmp62_ = _tmp61_; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp65_ = g_file_get_path (_tmp64_); + _tmp63_ = g_file_get_path (_tmp62_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp66_ = _tmp65_; + _tmp64_ = _tmp63_; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp67_ = err; + _tmp65_ = err; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp68_ = _tmp67_->message; + _tmp66_ = _tmp65_->message; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp69_ = g_strdup_printf (_tmp61_, _tmp66_, _tmp68_); + _tmp67_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp64_, _tmp66_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp70_ = _tmp69_; + _tmp68_ = _tmp67_; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp70_); + app_window_panic (_tmp68_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp70_); + _g_free0 (_tmp68_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp66_); + _g_free0 (_tmp64_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp64_); + _g_object_unref0 (_tmp62_); #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 720 "AppDirs.c" +#line 714 "AppDirs.c" } - __finally446: + __finally447: #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -735,41 +729,41 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 739 "AppDirs.c" +#line 733 "AppDirs.c" } } #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp71_ = old_dir; + _tmp69_ = old_dir; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp72_ = g_file_get_path (_tmp71_); + _tmp70_ = g_file_get_path (_tmp69_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp73_ = _tmp72_; + _tmp71_ = _tmp70_; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp74_ = new_dir; + _tmp72_ = new_dir; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp75_ = g_file_get_path (_tmp74_); + _tmp73_ = g_file_get_path (_tmp72_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp76_ = _tmp75_; + _tmp74_ = _tmp73_; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_rename (_tmp73_, _tmp76_); + g_rename (_tmp71_, _tmp74_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp76_); + _g_free0 (_tmp74_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp73_); + _g_free0 (_tmp71_); #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp77_ = new_dir; + _tmp75_ = new_dir; #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp78_ = g_file_get_path (_tmp77_); + _tmp76_ = g_file_get_path (_tmp75_); #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp79_ = _tmp78_; + _tmp77_ = _tmp76_; #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_chmod (_tmp79_, 0700); + g_chmod (_tmp77_, 0700); #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp79_); + _g_free0 (_tmp77_); #line 81 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp80_ = mask; + _tmp78_ = mask; #line 81 "/home/jens/Source/shotwell/src/AppDirs.vala" - umask (_tmp80_); + umask (_tmp78_); #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (cache_dir); #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -778,22 +772,22 @@ void app_dirs_try_migrate_data (void) { _g_object_unref0 (old_dir); #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (user_plugin_dir); -#line 782 "AppDirs.c" +#line 776 "AppDirs.c" } void app_dirs_set_data_dir (const gchar* user_data_dir) { - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GFile* _tmp2_ = NULL; + const gchar* _tmp0_; + gboolean _tmp1_; + GFile* _tmp2_; gchar* path = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - GFile* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (user_data_dir != NULL); #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -818,11 +812,11 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) { _tmp6_ = g_path_is_absolute (_tmp5_); #line 90 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp6_) { -#line 822 "AppDirs.c" - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; +#line 816 "AppDirs.c" + GFile* _tmp7_; + GFile* _tmp8_; + const gchar* _tmp9_; + GFile* _tmp10_; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp7_ = app_dirs_get_home_dir (); #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -837,10 +831,10 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) { app_dirs_data_dir = _tmp10_; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp8_); -#line 841 "AppDirs.c" +#line 835 "AppDirs.c" } else { - const gchar* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; + const gchar* _tmp11_; + GFile* _tmp12_; #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp11_ = path; #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -849,7 +843,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) { _g_object_unref0 (app_dirs_data_dir); #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_data_dir = _tmp12_; -#line 853 "AppDirs.c" +#line 847 "AppDirs.c" } #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp13_ = app_dirs_data_dir; @@ -863,84 +857,81 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) { _g_free0 (_tmp15_); #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); -#line 867 "AppDirs.c" +#line 861 "AppDirs.c" } void app_dirs_verify_data_dir (void) { GFile* data_dir = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; GError * _inner_error_ = NULL; #line 99 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_data_dir (); #line 99 "/home/jens/Source/shotwell/src/AppDirs.vala" data_dir = _tmp0_; -#line 879 "AppDirs.c" +#line 873 "AppDirs.c" { - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GFile* _tmp1_; + gboolean _tmp2_; #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = data_dir; #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_file_query_exists (_tmp1_, NULL); #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp2_) { -#line 889 "AppDirs.c" - GFile* _tmp3_ = NULL; +#line 883 "AppDirs.c" + GFile* _tmp3_; #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp3_ = data_dir; #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_); #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 897 "AppDirs.c" - goto __catch447_g_error; +#line 891 "AppDirs.c" + goto __catch448_g_error; } } } - goto __finally447; - __catch447_g_error: + goto __finally448; + __catch448_g_error: { GError* err = NULL; - const gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + GFile* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = _ ("Unable to create data directory %s: %s"); -#line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = data_dir; + _tmp4_ = data_dir; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = g_file_get_path (_tmp4_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = err; + _tmp7_ = err; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = _tmp8_->message; + _tmp8_ = _tmp7_->message; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_strdup_printf (_tmp4_, _tmp7_, _tmp9_); + _tmp9_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp6_, _tmp8_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp11_); + app_window_panic (_tmp10_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 942 "AppDirs.c" +#line 933 "AppDirs.c" } - __finally447: + __finally448: #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -951,88 +942,85 @@ void app_dirs_verify_data_dir (void) { g_clear_error (&_inner_error_); #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 955 "AppDirs.c" +#line 946 "AppDirs.c" } #line 98 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (data_dir); -#line 959 "AppDirs.c" +#line 950 "AppDirs.c" } void app_dirs_verify_cache_dir (void) { GFile* cache_dir = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; GError * _inner_error_ = NULL; #line 110 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_cache_dir (); #line 110 "/home/jens/Source/shotwell/src/AppDirs.vala" cache_dir = _tmp0_; -#line 971 "AppDirs.c" +#line 962 "AppDirs.c" { - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GFile* _tmp1_; + gboolean _tmp2_; #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = cache_dir; #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_file_query_exists (_tmp1_, NULL); #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp2_) { -#line 981 "AppDirs.c" - GFile* _tmp3_ = NULL; +#line 972 "AppDirs.c" + GFile* _tmp3_; #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp3_ = cache_dir; #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_); #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 989 "AppDirs.c" - goto __catch448_g_error; +#line 980 "AppDirs.c" + goto __catch449_g_error; } } } - goto __finally448; - __catch448_g_error: + goto __finally449; + __catch449_g_error: { GError* err = NULL; - const gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + GFile* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = _ ("Unable to create cache directory %s: %s"); + _tmp4_ = cache_dir; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = cache_dir; + _tmp5_ = g_file_get_path (_tmp4_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = g_file_get_path (_tmp5_); -#line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = err; + _tmp7_ = err; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = _tmp8_->message; + _tmp8_ = _tmp7_->message; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_strdup_printf (_tmp4_, _tmp7_, _tmp9_); + _tmp9_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp6_, _tmp8_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp11_); + app_window_panic (_tmp10_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1034 "AppDirs.c" +#line 1022 "AppDirs.c" } - __finally448: + __finally449: #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1043,11 +1031,11 @@ void app_dirs_verify_cache_dir (void) { g_clear_error (&_inner_error_); #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 1047 "AppDirs.c" +#line 1035 "AppDirs.c" } #line 109 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (cache_dir); -#line 1051 "AppDirs.c" +#line 1039 "AppDirs.c" } @@ -1057,17 +1045,17 @@ void app_dirs_verify_cache_dir (void) { */ GFile* app_dirs_get_libexec_dir (void) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; + GFile* _tmp0_; + GFile* _tmp6_; + GFile* _tmp7_; #line 125 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_libexec_dir; #line 125 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp0_ == NULL) { -#line 1068 "AppDirs.c" - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1056 "AppDirs.c" + GFile* _tmp1_; + GFile* _tmp2_; + gboolean _tmp3_; #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = app_dirs_get_install_dir (); #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1078,24 +1066,24 @@ GFile* app_dirs_get_libexec_dir (void) { _g_object_unref0 (_tmp2_); #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp3_) { -#line 1082 "AppDirs.c" - GFile* _tmp4_ = NULL; +#line 1070 "AppDirs.c" + GFile* _tmp4_; #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = app_dirs_get_exec_dir (); #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (app_dirs_libexec_dir); #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_libexec_dir = _tmp4_; -#line 1090 "AppDirs.c" +#line 1078 "AppDirs.c" } else { - GFile* _tmp5_ = NULL; + GFile* _tmp5_; #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp5_ = g_file_new_for_path (RESOURCES_LIBEXECDIR); #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (app_dirs_libexec_dir); #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_libexec_dir = _tmp5_; -#line 1099 "AppDirs.c" +#line 1087 "AppDirs.c" } } #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1106,14 +1094,14 @@ GFile* app_dirs_get_libexec_dir (void) { result = _tmp7_; #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1110 "AppDirs.c" +#line 1098 "AppDirs.c" } GFile* app_dirs_get_install_dir (void) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_exec_dir; #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1122,23 +1110,23 @@ GFile* app_dirs_get_install_dir (void) { result = _tmp1_; #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1126 "AppDirs.c" +#line 1114 "AppDirs.c" } GFile* app_dirs_get_data_dir (void) { GFile* result = NULL; GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp1_; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = app_dirs_data_dir; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp1_ == NULL) { -#line 1138 "AppDirs.c" - const gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; +#line 1126 "AppDirs.c" + const gchar* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_get_user_data_dir (); #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1153,10 +1141,10 @@ GFile* app_dirs_get_data_dir (void) { _tmp0_ = _tmp5_; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp4_); -#line 1157 "AppDirs.c" +#line 1145 "AppDirs.c" } else { - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; + GFile* _tmp6_; + GFile* _tmp7_; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = app_dirs_data_dir; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1165,34 +1153,33 @@ GFile* app_dirs_get_data_dir (void) { _g_object_unref0 (_tmp0_); #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = _tmp7_; -#line 1169 "AppDirs.c" +#line 1157 "AppDirs.c" } #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp0_; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1175 "AppDirs.c" +#line 1163 "AppDirs.c" } GFile* app_dirs_get_import_dir (void) { GFile* result = NULL; gchar* path = NULL; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; - GFile* _tmp23_ = NULL; - GFile* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - GFile* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gboolean _tmp5_; + const gchar* _tmp17_; + gchar* _tmp18_; + const gchar* _tmp19_; + gboolean _tmp20_; + GFile* _tmp23_; + GFile* _tmp24_; + GFile* _tmp25_; + GFile* _tmp26_; #line 149 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = config_facade_get_instance (); #line 149 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1211,13 +1198,13 @@ GFile* app_dirs_get_import_dir (void) { _tmp5_ = is_string_empty (_tmp4_); #line 150 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp5_) { -#line 1215 "AppDirs.c" - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - const gchar* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; +#line 1202 "AppDirs.c" + const gchar* _tmp6_; + gchar* _tmp7_; + const gchar* _tmp8_; + gboolean _tmp9_; + const gchar* _tmp15_; + GFile* _tmp16_; #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = path; #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1232,12 +1219,12 @@ GFile* app_dirs_get_import_dir (void) { _tmp9_ = g_path_is_absolute (_tmp8_); #line 155 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp9_) { -#line 1236 "AppDirs.c" - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; +#line 1223 "AppDirs.c" + GFile* _tmp10_; + GFile* _tmp11_; + const gchar* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp10_ = app_dirs_get_home_dir (); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1256,7 +1243,7 @@ GFile* app_dirs_get_import_dir (void) { _g_free0 (path); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1260 "AppDirs.c" +#line 1247 "AppDirs.c" } #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp15_ = path; @@ -1268,7 +1255,7 @@ GFile* app_dirs_get_import_dir (void) { _g_free0 (path); #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1272 "AppDirs.c" +#line 1259 "AppDirs.c" } #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp17_ = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); @@ -1284,9 +1271,9 @@ GFile* app_dirs_get_import_dir (void) { _tmp20_ = is_string_empty (_tmp19_); #line 164 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp20_) { -#line 1288 "AppDirs.c" - const gchar* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; +#line 1275 "AppDirs.c" + const gchar* _tmp21_; + GFile* _tmp22_; #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp21_ = path; #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1297,57 +1284,55 @@ GFile* app_dirs_get_import_dir (void) { _g_free0 (path); #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1301 "AppDirs.c" +#line 1288 "AppDirs.c" } #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp23_ = app_dirs_get_home_dir (); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp24_ = _tmp23_; #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp25_ = _ ("Pictures"); -#line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp26_ = g_file_get_child (_tmp24_, _tmp25_); + _tmp25_ = g_file_get_child (_tmp24_, _ ("Pictures")); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp24_); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp27_; + result = _tmp26_; #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1321 "AppDirs.c" +#line 1306 "AppDirs.c" } GFile* app_dirs_get_baked_import_dir (time_t tm) { GFile* result = NULL; gchar* pattern = NULL; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - const gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gboolean _tmp5_; + const gchar* _tmp9_; + gboolean _tmp10_; GDateTime* date = NULL; - time_t _tmp12_ = 0; - GDateTime* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - GFile* _tmp26_ = NULL; + time_t _tmp12_; + GDateTime* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + GFile* _tmp25_; + GFile* _tmp26_; #line 173 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = config_facade_get_instance (); #line 173 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1366,10 +1351,10 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) { _tmp5_ = is_string_empty (_tmp4_); #line 174 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp5_) { -#line 1370 "AppDirs.c" - ConfigFacade* _tmp6_ = NULL; - ConfigFacade* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; +#line 1355 "AppDirs.c" + ConfigFacade* _tmp6_; + ConfigFacade* _tmp7_; + gchar* _tmp8_; #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = config_facade_get_instance (); #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1382,7 +1367,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) { pattern = _tmp8_; #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp7_); -#line 1386 "AppDirs.c" +#line 1371 "AppDirs.c" } #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp9_ = pattern; @@ -1390,15 +1375,15 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) { _tmp10_ = is_string_empty (_tmp9_); #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp10_) { -#line 1394 "AppDirs.c" - gchar* _tmp11_ = NULL; +#line 1379 "AppDirs.c" + gchar* _tmp11_; #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp11_ = g_strdup ("%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d"); #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (pattern); #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala" pattern = _tmp11_; -#line 1402 "AppDirs.c" +#line 1387 "AppDirs.c" } #line 179 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp12_ = tm; @@ -1450,18 +1435,18 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) { _g_free0 (pattern); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1454 "AppDirs.c" +#line 1439 "AppDirs.c" } gboolean app_dirs_is_in_import_dir (GFile* file) { gboolean result = FALSE; GFile* import_dir = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; gboolean _tmp1_ = FALSE; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GFile* _tmp2_; + GFile* _tmp3_; + gboolean _tmp4_; #line 184 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 185 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1478,11 +1463,11 @@ gboolean app_dirs_is_in_import_dir (GFile* file) { if (_tmp4_) { #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = TRUE; -#line 1482 "AppDirs.c" +#line 1467 "AppDirs.c" } else { - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GFile* _tmp5_; + GFile* _tmp6_; + gboolean _tmp7_; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp5_ = file; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1491,7 +1476,7 @@ gboolean app_dirs_is_in_import_dir (GFile* file) { _tmp7_ = g_file_equal (_tmp5_, _tmp6_); #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp7_; -#line 1495 "AppDirs.c" +#line 1480 "AppDirs.c" } #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp1_; @@ -1499,14 +1484,14 @@ gboolean app_dirs_is_in_import_dir (GFile* file) { _g_object_unref0 (import_dir); #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1503 "AppDirs.c" +#line 1488 "AppDirs.c" } void app_dirs_set_import_dir (const gchar* path) { - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; #line 190 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (path != NULL); #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1519,14 +1504,14 @@ void app_dirs_set_import_dir (const gchar* path) { configuration_facade_set_import_dir (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_); #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); -#line 1523 "AppDirs.c" +#line 1508 "AppDirs.c" } GFile* app_dirs_get_exec_dir (void) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_exec_dir; #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1535,26 +1520,26 @@ GFile* app_dirs_get_exec_dir (void) { result = _tmp1_; #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1539 "AppDirs.c" +#line 1524 "AppDirs.c" } GFile* app_dirs_get_temp_dir (void) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; + GFile* _tmp0_; + GFile* _tmp16_; + GFile* _tmp17_; GError * _inner_error_ = NULL; #line 199 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_tmp_dir; #line 199 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp0_ == NULL) { -#line 1553 "AppDirs.c" - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; +#line 1538 "AppDirs.c" + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; #line 200 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = g_get_tmp_dir (); #line 200 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1571,72 +1556,69 @@ GFile* app_dirs_get_temp_dir (void) { app_dirs_tmp_dir = _tmp5_; #line 200 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp4_); -#line 1575 "AppDirs.c" +#line 1560 "AppDirs.c" { - GFile* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GFile* _tmp6_; + gboolean _tmp7_; #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = app_dirs_tmp_dir; #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp7_ = g_file_query_exists (_tmp6_, NULL); #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp7_) { -#line 1585 "AppDirs.c" - GFile* _tmp8_ = NULL; +#line 1570 "AppDirs.c" + GFile* _tmp8_; #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp8_ = app_dirs_tmp_dir; #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" g_file_make_directory_with_parents (_tmp8_, NULL, &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1593 "AppDirs.c" - goto __catch449_g_error; +#line 1578 "AppDirs.c" + goto __catch450_g_error; } } } - goto __finally449; - __catch449_g_error: + goto __finally450; + __catch450_g_error: { GError* err = NULL; - const gchar* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - GError* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GError* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = _ ("Unable to create temporary directory %s: %s"); + _tmp9_ = app_dirs_tmp_dir; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = app_dirs_tmp_dir; + _tmp10_ = g_file_get_path (_tmp9_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = g_file_get_path (_tmp10_); -#line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = err; + _tmp12_ = err; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = _tmp13_->message; + _tmp13_ = _tmp12_->message; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = g_strdup_printf (_tmp9_, _tmp12_, _tmp14_); + _tmp14_ = g_strdup_printf (_ ("Unable to create temporary directory %s: %s"), _tmp11_, _tmp13_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp16_); + app_window_panic (_tmp15_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp11_); #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1638 "AppDirs.c" +#line 1620 "AppDirs.c" } - __finally449: + __finally450: #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1645,30 +1627,30 @@ GFile* app_dirs_get_temp_dir (void) { g_clear_error (&_inner_error_); #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 1649 "AppDirs.c" +#line 1631 "AppDirs.c" } } #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = app_dirs_tmp_dir; + _tmp16_ = app_dirs_tmp_dir; #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp17_ = _g_object_ref0 (_tmp16_); #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp18_; + result = _tmp17_; #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1660 "AppDirs.c" +#line 1642 "AppDirs.c" } GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { GFile* result = NULL; GFile* subdir = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + const gchar* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + const gchar* _tmp5_; GError * _inner_error_ = NULL; #line 214 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (name != NULL, NULL); @@ -1690,10 +1672,10 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { _tmp5_ = subname; #line 216 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp5_ != NULL) { -#line 1694 "AppDirs.c" - GFile* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; +#line 1676 "AppDirs.c" + GFile* _tmp6_; + const gchar* _tmp7_; + GFile* _tmp8_; #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = subdir; #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1704,73 +1686,70 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { _g_object_unref0 (subdir); #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" subdir = _tmp8_; -#line 1708 "AppDirs.c" +#line 1690 "AppDirs.c" } { - GFile* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + GFile* _tmp9_; + gboolean _tmp10_; #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp9_ = subdir; #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp10_ = g_file_query_exists (_tmp9_, NULL); #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp10_) { -#line 1719 "AppDirs.c" - GFile* _tmp11_ = NULL; +#line 1701 "AppDirs.c" + GFile* _tmp11_; #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp11_ = subdir; #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_); #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1727 "AppDirs.c" - goto __catch450_g_error; +#line 1709 "AppDirs.c" + goto __catch451_g_error; } } } - goto __finally450; - __catch450_g_error: + goto __finally451; + __catch451_g_error: { GError* err = NULL; - const gchar* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - GError* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + GFile* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + GError* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = _ ("Unable to create data subdirectory %s: %s"); + _tmp12_ = subdir; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = subdir; -#line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp13_ = g_file_get_path (_tmp12_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = err; + _tmp15_ = err; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _tmp16_->message; + _tmp16_ = _tmp15_->message; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = g_strdup_printf (_tmp12_, _tmp15_, _tmp17_); + _tmp17_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp14_, _tmp16_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp19_); + app_window_panic (_tmp18_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp18_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1772 "AppDirs.c" +#line 1751 "AppDirs.c" } - __finally450: + __finally451: #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1781,19 +1760,19 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { g_clear_error (&_inner_error_); #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 1785 "AppDirs.c" +#line 1764 "AppDirs.c" } #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala" result = subdir; #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1791 "AppDirs.c" +#line 1770 "AppDirs.c" } void app_dirs_ensure_writable (GFile* dir) { - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GFile* _tmp0_; + gboolean _tmp1_; GError * _inner_error_ = NULL; #line 230 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (G_IS_FILE (dir)); @@ -1803,18 +1782,18 @@ void app_dirs_ensure_writable (GFile* dir) { _tmp1_ = g_file_query_exists (_tmp0_, NULL); #line 231 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp1_) { -#line 1807 "AppDirs.c" +#line 1786 "AppDirs.c" { GFileInfo* info = NULL; - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; + GFile* _tmp2_; + GFileInfo* _tmp3_; guint32 mode = 0U; - GFileInfo* _tmp4_ = NULL; - guint32 _tmp5_ = 0U; + GFileInfo* _tmp4_; + guint32 _tmp5_; gboolean _tmp6_ = FALSE; - GFile* _tmp7_ = NULL; - guint32 _tmp8_ = 0U; - gboolean _tmp9_ = FALSE; + GFile* _tmp7_; + guint32 _tmp8_; + gboolean _tmp9_; #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = dir; #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1823,8 +1802,8 @@ void app_dirs_ensure_writable (GFile* dir) { info = _tmp3_; #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1827 "AppDirs.c" - goto __catch451_g_error; +#line 1806 "AppDirs.c" + goto __catch452_g_error; } #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = info; @@ -1844,85 +1823,79 @@ void app_dirs_ensure_writable (GFile* dir) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (info); -#line 1848 "AppDirs.c" - goto __catch451_g_error; +#line 1827 "AppDirs.c" + goto __catch452_g_error; } #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp6_) { -#line 1853 "AppDirs.c" - const gchar* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; -#line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = _ ("Could not make directory %s writable"); +#line 1832 "AppDirs.c" + GFile* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = dir; + _tmp10_ = dir; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = g_file_get_path (_tmp11_); + _tmp11_ = g_file_get_path (_tmp10_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_strdup_printf (_tmp10_, _tmp13_); + _tmp13_ = g_strdup_printf (_ ("Could not make directory %s writable"), _tmp12_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp15_); + app_window_panic (_tmp14_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp13_); -#line 1878 "AppDirs.c" + _g_free0 (_tmp12_); +#line 1854 "AppDirs.c" } #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (info); -#line 1882 "AppDirs.c" +#line 1858 "AppDirs.c" } - goto __finally451; - __catch451_g_error: + goto __finally452; + __catch452_g_error: { GError* err = NULL; - const gchar* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - GError* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; + GFile* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + GError* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = _ ("Could not make directory %s writable: %s"); + _tmp15_ = dir; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = dir; + _tmp16_ = g_file_get_path (_tmp15_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = g_file_get_path (_tmp17_); + _tmp17_ = _tmp16_; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = _tmp18_; + _tmp18_ = err; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = err; + _tmp19_ = _tmp18_->message; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = _tmp20_->message; + _tmp20_ = g_strdup_printf (_ ("Could not make directory %s writable: %s"), _tmp17_, _tmp19_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp22_ = g_strdup_printf (_tmp16_, _tmp19_, _tmp21_); + _tmp21_ = _tmp20_; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp23_ = _tmp22_; + app_window_panic (_tmp21_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp23_); + _g_free0 (_tmp21_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp23_); -#line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp17_); #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1924 "AppDirs.c" +#line 1897 "AppDirs.c" } - __finally451: + __finally452: #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1931,7 +1904,7 @@ void app_dirs_ensure_writable (GFile* dir) { g_clear_error (&_inner_error_); #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 1935 "AppDirs.c" +#line 1908 "AppDirs.c" } } } @@ -1940,14 +1913,14 @@ void app_dirs_ensure_writable (GFile* dir) { GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { GFile* result = NULL; GFile* subdir = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GFile* _tmp21_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + const gchar* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + const gchar* _tmp6_; + GFile* _tmp20_; GError * _inner_error_ = NULL; #line 244 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (name != NULL, NULL); @@ -1973,10 +1946,10 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { _tmp6_ = subname; #line 247 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp6_ != NULL) { -#line 1977 "AppDirs.c" - GFile* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; +#line 1950 "AppDirs.c" + GFile* _tmp7_; + const gchar* _tmp8_; + GFile* _tmp9_; #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp7_ = subdir; #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1987,73 +1960,70 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { _g_object_unref0 (subdir); #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" subdir = _tmp9_; -#line 1991 "AppDirs.c" +#line 1964 "AppDirs.c" } { - GFile* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GFile* _tmp10_; + gboolean _tmp11_; #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp10_ = subdir; #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp11_ = g_file_query_exists (_tmp10_, NULL); #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp11_) { -#line 2002 "AppDirs.c" - GFile* _tmp12_ = NULL; +#line 1975 "AppDirs.c" + GFile* _tmp12_; #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp12_ = subdir; #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" g_file_make_directory_with_parents (_tmp12_, NULL, &_inner_error_); #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2010 "AppDirs.c" - goto __catch452_g_error; +#line 1983 "AppDirs.c" + goto __catch453_g_error; } } } - goto __finally452; - __catch452_g_error: + goto __finally453; + __catch453_g_error: { GError* err = NULL; - const gchar* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - GError* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + GError* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" err = _inner_error_; #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" _inner_error_ = NULL; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = _ ("Unable to create data subdirectory %s: %s"); -#line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = subdir; + _tmp13_ = subdir; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = g_file_get_path (_tmp14_); + _tmp14_ = g_file_get_path (_tmp13_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = err; + _tmp16_ = err; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = _tmp17_->message; + _tmp17_ = _tmp16_->message; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = g_strdup_printf (_tmp13_, _tmp16_, _tmp18_); + _tmp18_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp15_, _tmp17_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp20_); + app_window_panic (_tmp19_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp19_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 2055 "AppDirs.c" +#line 2025 "AppDirs.c" } - __finally452: + __finally453: #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2064,26 +2034,26 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { g_clear_error (&_inner_error_); #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2068 "AppDirs.c" +#line 2038 "AppDirs.c" } #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = subdir; + _tmp20_ = subdir; #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_ensure_writable (_tmp21_); + app_dirs_ensure_writable (_tmp20_); #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala" result = subdir; #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2078 "AppDirs.c" +#line 2048 "AppDirs.c" } GFile* app_dirs_get_lib_dir (void) { GFile* result = NULL; GFile* install_dir = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + GFile* _tmp2_; #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_install_dir (); #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2092,11 +2062,11 @@ GFile* app_dirs_get_lib_dir (void) { _tmp2_ = install_dir; #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp2_ != NULL) { -#line 2096 "AppDirs.c" - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; +#line 2066 "AppDirs.c" + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp3_ = install_dir; #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2111,16 +2081,16 @@ GFile* app_dirs_get_lib_dir (void) { _tmp1_ = _tmp6_; #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp5_); -#line 2115 "AppDirs.c" +#line 2085 "AppDirs.c" } else { - GFile* _tmp7_ = NULL; + GFile* _tmp7_; #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp7_ = app_dirs_get_exec_dir (); #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp7_; -#line 2124 "AppDirs.c" +#line 2094 "AppDirs.c" } #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp1_; @@ -2128,16 +2098,16 @@ GFile* app_dirs_get_lib_dir (void) { _g_object_unref0 (install_dir); #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2132 "AppDirs.c" +#line 2102 "AppDirs.c" } GFile* app_dirs_get_system_plugins_dir (void) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; #line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_lib_dir (); #line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2152,16 +2122,16 @@ GFile* app_dirs_get_system_plugins_dir (void) { result = _tmp3_; #line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2156 "AppDirs.c" +#line 2126 "AppDirs.c" } GFile* app_dirs_get_user_plugins_dir (void) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; #line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_data_dir (); #line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2176,19 +2146,19 @@ GFile* app_dirs_get_user_plugins_dir (void) { result = _tmp3_; #line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2180 "AppDirs.c" +#line 2150 "AppDirs.c" } GFile* app_dirs_get_log_file (void) { GFile* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 277 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = g_getenv ("SHOTWELL_LOG_FILE"); #line 277 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp0_ != NULL) { -#line 2191 "AppDirs.c" - const gchar* _tmp1_ = NULL; +#line 2161 "AppDirs.c" + const gchar* _tmp1_; #line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = g_getenv ("SHOTWELL_LOG_FILE"); #line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2197,10 +2167,10 @@ GFile* app_dirs_get_log_file (void) { result = NULL; #line 279 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2201 "AppDirs.c" +#line 2171 "AppDirs.c" } else { - const gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + const gchar* _tmp2_; + GFile* _tmp3_; #line 281 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_getenv ("SHOTWELL_LOG_FILE"); #line 281 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2209,16 +2179,16 @@ GFile* app_dirs_get_log_file (void) { result = _tmp3_; #line 281 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2213 "AppDirs.c" +#line 2183 "AppDirs.c" } } else { - const gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; + const gchar* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; #line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = g_get_user_cache_dir (); #line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2241,7 +2211,7 @@ GFile* app_dirs_get_log_file (void) { result = _tmp10_; #line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2245 "AppDirs.c" +#line 2215 "AppDirs.c" } } @@ -2250,16 +2220,16 @@ GFile* app_dirs_get_thumbnailer_bin (void) { GFile* result = NULL; #line 290 "/home/jens/Source/shotwell/src/AppDirs.vala" static const char filename[] = "shotwell-video-thumbnailer"; -#line 2254 "AppDirs.c" +#line 2224 "AppDirs.c" GFile* f = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GFile* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + gboolean _tmp7_; #line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_libexec_dir (); #line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2284,12 +2254,12 @@ GFile* app_dirs_get_thumbnailer_bin (void) { _tmp7_ = g_file_query_exists (_tmp6_, NULL); #line 292 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp7_) { -#line 2288 "AppDirs.c" - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; +#line 2258 "AppDirs.c" + GFile* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; #line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp8_ = app_dirs_get_libexec_dir (); #line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2308,13 +2278,13 @@ GFile* app_dirs_get_thumbnailer_bin (void) { _g_object_unref0 (_tmp11_); #line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp9_); -#line 2312 "AppDirs.c" +#line 2282 "AppDirs.c" } #line 296 "/home/jens/Source/shotwell/src/AppDirs.vala" result = f; #line 296 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2318 "AppDirs.c" +#line 2288 "AppDirs.c" } @@ -2322,16 +2292,16 @@ GFile* app_dirs_get_settings_migrator_bin (void) { GFile* result = NULL; #line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" static const char filename[] = "shotwell-settings-migrator"; -#line 2326 "AppDirs.c" +#line 2296 "AppDirs.c" GFile* f = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GFile* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + gboolean _tmp7_; #line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_libexec_dir (); #line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2356,12 +2326,12 @@ GFile* app_dirs_get_settings_migrator_bin (void) { _tmp7_ = g_file_query_exists (_tmp6_, NULL); #line 302 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp7_) { -#line 2360 "AppDirs.c" - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; +#line 2330 "AppDirs.c" + GFile* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; #line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp8_ = app_dirs_get_libexec_dir (); #line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2380,13 +2350,13 @@ GFile* app_dirs_get_settings_migrator_bin (void) { _g_object_unref0 (_tmp11_); #line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp9_); -#line 2384 "AppDirs.c" +#line 2354 "AppDirs.c" } #line 306 "/home/jens/Source/shotwell/src/AppDirs.vala" result = f; #line 306 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2390 "AppDirs.c" +#line 2360 "AppDirs.c" } @@ -2396,21 +2366,21 @@ AppDirs* app_dirs_construct (GType object_type) { self = (AppDirs*) g_type_create_instance (object_type); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return self; -#line 2400 "AppDirs.c" +#line 2370 "AppDirs.c" } AppDirs* app_dirs_new (void) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return app_dirs_construct (TYPE_APP_DIRS); -#line 2407 "AppDirs.c" +#line 2377 "AppDirs.c" } static void value_app_dirs_init (GValue* value) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2414 "AppDirs.c" +#line 2384 "AppDirs.c" } @@ -2419,7 +2389,7 @@ static void value_app_dirs_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_unref (value->data[0].v_pointer); -#line 2423 "AppDirs.c" +#line 2393 "AppDirs.c" } } @@ -2429,11 +2399,11 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" dest_value->data[0].v_pointer = app_dirs_ref (src_value->data[0].v_pointer); -#line 2433 "AppDirs.c" +#line 2403 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" dest_value->data[0].v_pointer = NULL; -#line 2437 "AppDirs.c" +#line 2407 "AppDirs.c" } } @@ -2441,66 +2411,66 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val static gpointer value_app_dirs_peek_pointer (const GValue* value) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return value->data[0].v_pointer; -#line 2445 "AppDirs.c" +#line 2415 "AppDirs.c" } static gchar* value_app_dirs_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (collect_values[0].v_pointer) { -#line 2452 "AppDirs.c" - AppDirs* object; +#line 2422 "AppDirs.c" + AppDirs * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2459 "AppDirs.c" +#line 2429 "AppDirs.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2463 "AppDirs.c" +#line 2433 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = app_dirs_ref (object); -#line 2467 "AppDirs.c" +#line 2437 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2471 "AppDirs.c" +#line 2441 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2475 "AppDirs.c" +#line 2445 "AppDirs.c" } static gchar* value_app_dirs_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - AppDirs** object_p; + AppDirs ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2486 "AppDirs.c" +#line 2456 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" *object_p = NULL; -#line 2492 "AppDirs.c" +#line 2462 "AppDirs.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" *object_p = value->data[0].v_pointer; -#line 2496 "AppDirs.c" +#line 2466 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" *object_p = app_dirs_ref (value->data[0].v_pointer); -#line 2500 "AppDirs.c" +#line 2470 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2504 "AppDirs.c" +#line 2474 "AppDirs.c" } @@ -2514,7 +2484,7 @@ GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return G_PARAM_SPEC (spec); -#line 2518 "AppDirs.c" +#line 2488 "AppDirs.c" } @@ -2523,12 +2493,12 @@ gpointer value_get_app_dirs (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS), NULL); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return value->data[0].v_pointer; -#line 2527 "AppDirs.c" +#line 2497 "AppDirs.c" } void value_set_app_dirs (GValue* value, gpointer v_object) { - AppDirs* old; + AppDirs * old; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS)); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2543,23 +2513,23 @@ void value_set_app_dirs (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_ref (value->data[0].v_pointer); -#line 2547 "AppDirs.c" +#line 2517 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2551 "AppDirs.c" +#line 2521 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_unref (old); -#line 2557 "AppDirs.c" +#line 2527 "AppDirs.c" } } void value_take_app_dirs (GValue* value, gpointer v_object) { - AppDirs* old; + AppDirs * old; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS)); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2572,17 +2542,17 @@ void value_take_app_dirs (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = v_object; -#line 2576 "AppDirs.c" +#line 2546 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2580 "AppDirs.c" +#line 2550 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_unref (old); -#line 2586 "AppDirs.c" +#line 2556 "AppDirs.c" } } @@ -2592,24 +2562,24 @@ static void app_dirs_class_init (AppDirsClass * klass) { app_dirs_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" ((AppDirsClass *) klass)->finalize = app_dirs_finalize; -#line 2596 "AppDirs.c" +#line 2566 "AppDirs.c" } static void app_dirs_instance_init (AppDirs * self) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" self->ref_count = 1; -#line 2603 "AppDirs.c" +#line 2573 "AppDirs.c" } -static void app_dirs_finalize (AppDirs* obj) { +static void app_dirs_finalize (AppDirs * obj) { AppDirs * self; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_DIRS, AppDirs); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_signal_handlers_destroy (self); -#line 2613 "AppDirs.c" +#line 2583 "AppDirs.c" } @@ -2628,18 +2598,18 @@ GType app_dirs_get_type (void) { gpointer app_dirs_ref (gpointer instance) { - AppDirs* self; + AppDirs * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return instance; -#line 2638 "AppDirs.c" +#line 2608 "AppDirs.c" } void app_dirs_unref (gpointer instance) { - AppDirs* self; + AppDirs * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2647,7 +2617,7 @@ void app_dirs_unref (gpointer instance) { APP_DIRS_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2651 "AppDirs.c" +#line 2621 "AppDirs.c" } } |