diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:57:00 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:57:00 +0200 |
| commit | a9bafe967a7a664c43dec4aeb64a6f6e0f284e05 (patch) | |
| tree | 653c43a63b70c47278367ad2a4e92640a6669b44 /src/AppDirs.c | |
| parent | 55778740c211992cc86ea87588ab62c6750f36d1 (diff) | |
| parent | ab841afa5cb39058d9ab2cebb67cfe6369443f6e (diff) | |
Update upstream source from tag 'upstream/0.28.3'
Update to upstream version '0.28.3'
with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7
Diffstat (limited to 'src/AppDirs.c')
| -rw-r--r-- | src/AppDirs.c | 1651 |
1 files changed, 814 insertions, 837 deletions
diff --git a/src/AppDirs.c b/src/AppDirs.c index 97986d0..ed0c0ca 100644 --- a/src/AppDirs.c +++ b/src/AppDirs.c @@ -1,4 +1,4 @@ -/* AppDirs.c generated by valac 0.36.6, the Vala compiler +/* AppDirs.c generated by valac 0.40.4, the Vala compiler * generated from AppDirs.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <gio/gio.h> @@ -88,14 +89,17 @@ static GFile* app_dirs_libexec_dir = NULL; gpointer app_dirs_ref (gpointer instance); void app_dirs_unref (gpointer instance); -GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_app_dirs (GValue* value, gpointer v_object); -void value_take_app_dirs (GValue* value, gpointer v_object); +GParamSpec* param_spec_app_dirs (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_app_dirs (GValue* value, + gpointer v_object); +void value_take_app_dirs (GValue* value, + gpointer v_object); gpointer value_get_app_dirs (const GValue* value); GType app_dirs_get_type (void) G_GNUC_CONST; -enum { - APP_DIRS_DUMMY_PROPERTY -}; #define APP_DIRS_DEFAULT_DATA_DIR "shotwell" void app_dirs_init (const gchar* arg0); void app_dirs_terminate (void); @@ -125,11 +129,14 @@ gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self); gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self); gboolean app_dirs_is_in_import_dir (GFile* file); void app_dirs_set_import_dir (const gchar* path); -void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar* import_dir); +void configuration_facade_set_import_dir (ConfigurationFacade* self, + const gchar* import_dir); GFile* app_dirs_get_temp_dir (void); -GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname); +GFile* app_dirs_get_data_subdir (const gchar* name, + const gchar* subname); void app_dirs_ensure_writable (GFile* dir); -GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname); +GFile* app_dirs_get_cache_subdir (const gchar* name, + const gchar* subname); GFile* app_dirs_get_lib_dir (void); #define RESOURCES_LIB _LIB GFile* app_dirs_get_system_plugins_dir (void); @@ -141,55 +148,58 @@ AppDirs* app_dirs_construct (GType object_type); static void app_dirs_finalize (AppDirs * obj); -void app_dirs_init (const gchar* arg0) { +void +app_dirs_init (const gchar* arg0) +{ GFile* exec_file = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; + GFile* _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" - _tmp0_ = arg0; + _tmp0_ = g_find_program_in_path (arg0); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = g_find_program_in_path (_tmp0_); -#line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = realpath (_tmp2_, NULL); + _tmp2_ = realpath (_tmp1_, NULL); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = g_file_new_for_path (_tmp4_); + _tmp4_ = g_file_new_for_path (_tmp3_); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 17 "/home/jens/Source/shotwell/src/AppDirs.vala" - exec_file = _tmp6_; + exec_file = _tmp5_; #line 18 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = g_file_get_parent (exec_file); + _tmp6_ = g_file_get_parent (exec_file); #line 18 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (app_dirs_exec_dir); #line 18 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_exec_dir = _tmp7_; + app_dirs_exec_dir = _tmp6_; #line 16 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (exec_file); -#line 185 "AppDirs.c" +#line 191 "AppDirs.c" } -void app_dirs_terminate (void) { +void +app_dirs_terminate (void) +{ } -GFile* app_dirs_get_home_dir (void) { +GFile* +app_dirs_get_home_dir (void) +{ GFile* result = NULL; const gchar* _tmp0_; GFile* _tmp1_; @@ -201,18 +211,22 @@ GFile* app_dirs_get_home_dir (void) { result = _tmp1_; #line 27 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 205 "AppDirs.c" +#line 215 "AppDirs.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala" return self ? g_object_ref (self) : NULL; -#line 212 "AppDirs.c" +#line 224 "AppDirs.c" } -GFile* app_dirs_get_cache_dir (void) { +GFile* +app_dirs_get_cache_dir (void) +{ GFile* result = NULL; GFile* _tmp0_ = NULL; GFile* _tmp1_; @@ -220,7 +234,7 @@ GFile* app_dirs_get_cache_dir (void) { _tmp1_ = app_dirs_data_dir; #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp1_ == NULL) { -#line 224 "AppDirs.c" +#line 238 "AppDirs.c" const gchar* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; @@ -239,7 +253,7 @@ GFile* app_dirs_get_cache_dir (void) { _tmp0_ = _tmp5_; #line 32 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp4_); -#line 243 "AppDirs.c" +#line 257 "AppDirs.c" } else { GFile* _tmp6_; GFile* _tmp7_; @@ -251,17 +265,19 @@ GFile* app_dirs_get_cache_dir (void) { _g_object_unref0 (_tmp0_); #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = _tmp7_; -#line 255 "AppDirs.c" +#line 269 "AppDirs.c" } #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp0_; #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 261 "AppDirs.c" +#line 275 "AppDirs.c" } -void app_dirs_try_migrate_data (void) { +void +app_dirs_try_migrate_data (void) +{ GFile* user_plugin_dir = NULL; GFile* _tmp0_; GFile* old_dir = NULL; @@ -275,46 +291,41 @@ void app_dirs_try_migrate_data (void) { GFile* _tmp8_; gboolean _tmp9_ = FALSE; GFile* _tmp10_; - gboolean _tmp11_; GFile* new_dir = NULL; + GFile* _tmp19_; + GFile* _tmp20_; GFile* _tmp21_; GFile* _tmp22_; - GFile* _tmp23_; + gboolean _tmp23_ = FALSE; GFile* _tmp24_; - gboolean _tmp25_ = FALSE; - GFile* _tmp26_; - gboolean _tmp27_; GFile* cache_dir = NULL; - GFile* _tmp30_; + GFile* _tmp26_; mode_t mask = {0}; - mode_t _tmp31_; - GFile* _tmp32_; - gboolean _tmp33_; + GFile* _tmp27_; + GFile* _tmp36_; + GFile* _tmp37_; + GFile* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + GFile* _tmp41_; GFile* _tmp42_; GFile* _tmp43_; - GFile* _tmp44_; + gchar* _tmp44_; gchar* _tmp45_; - gchar* _tmp46_; + GFile* _tmp46_; GFile* _tmp47_; GFile* _tmp48_; - GFile* _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; - GFile* _tmp52_; - GFile* _tmp53_; - GFile* _tmp54_; - gboolean _tmp55_; - gboolean _tmp56_; - GFile* _tmp69_; + gboolean _tmp49_; + GFile* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + GFile* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + GFile* _tmp68_; + gchar* _tmp69_; gchar* _tmp70_; - gchar* _tmp71_; - GFile* _tmp72_; - gchar* _tmp73_; - gchar* _tmp74_; - GFile* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - mode_t _tmp78_; + mode_t _tmp71_; GError * _inner_error_ = NULL; #line 38 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_user_plugins_dir (); @@ -347,52 +358,47 @@ void app_dirs_try_migrate_data (void) { #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp10_ = old_dir; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = g_file_query_exists (_tmp10_, NULL); -#line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp11_) { -#line 354 "AppDirs.c" + if (g_file_query_exists (_tmp10_, NULL)) { +#line 363 "AppDirs.c" + GFile* _tmp11_; GFile* _tmp12_; GFile* _tmp13_; - GFile* _tmp14_; - gboolean _tmp15_; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = user_plugin_dir; + _tmp11_ = user_plugin_dir; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_file_get_parent (_tmp12_); -#line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = _tmp13_; + _tmp12_ = g_file_get_parent (_tmp11_); #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = g_file_query_exists (_tmp14_, NULL); + _tmp13_ = _tmp12_; #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = !_tmp15_; + _tmp9_ = !g_file_query_exists (_tmp13_, NULL); #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp14_); -#line 371 "AppDirs.c" + _g_object_unref0 (_tmp13_); +#line 377 "AppDirs.c" } else { #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp9_ = FALSE; -#line 375 "AppDirs.c" +#line 381 "AppDirs.c" } #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp9_) { -#line 379 "AppDirs.c" +#line 385 "AppDirs.c" { + GFile* _tmp14_; + GFile* _tmp15_; GFile* _tmp16_; - GFile* _tmp17_; - GFile* _tmp18_; #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = user_plugin_dir; + _tmp14_ = user_plugin_dir; #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = g_file_get_parent (_tmp16_); + _tmp15_ = g_file_get_parent (_tmp14_); #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp18_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp16_, NULL, &_inner_error_); #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp16_); #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 396 "AppDirs.c" +#line 402 "AppDirs.c" goto __catch452_g_error; } } @@ -406,7 +412,7 @@ void app_dirs_try_migrate_data (void) { _inner_error_ = NULL; #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 410 "AppDirs.c" +#line 416 "AppDirs.c" } __finally452: #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -421,21 +427,21 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 425 "AppDirs.c" +#line 431 "AppDirs.c" } } { - GFile* _tmp19_; - GFile* _tmp20_; + GFile* _tmp17_; + GFile* _tmp18_; #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = old_dir; + _tmp17_ = old_dir; #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = user_plugin_dir; + _tmp18_ = user_plugin_dir; #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_move (_tmp19_, _tmp20_, G_FILE_COPY_NONE, NULL, NULL, NULL, &_inner_error_); + g_file_move (_tmp17_, _tmp18_, G_FILE_COPY_NONE, NULL, NULL, NULL, &_inner_error_); #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 439 "AppDirs.c" +#line 445 "AppDirs.c" goto __catch453_g_error; } } @@ -449,7 +455,7 @@ void app_dirs_try_migrate_data (void) { _inner_error_ = NULL; #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 453 "AppDirs.c" +#line 459 "AppDirs.c" } __finally453: #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -464,46 +470,41 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 468 "AppDirs.c" +#line 474 "AppDirs.c" } #line 53 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = app_dirs_get_data_dir (); + _tmp19_ = app_dirs_get_data_dir (); #line 53 "/home/jens/Source/shotwell/src/AppDirs.vala" - new_dir = _tmp21_; + new_dir = _tmp19_; #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp22_ = app_dirs_get_home_dir (); + _tmp20_ = app_dirs_get_home_dir (); #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp24_ = g_file_get_child (_tmp23_, ".shotwell"); + _tmp22_ = g_file_get_child (_tmp21_, ".shotwell"); #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (old_dir); #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - old_dir = _tmp24_; + old_dir = _tmp22_; #line 54 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp21_); #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp26_ = new_dir; + _tmp24_ = new_dir; #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp27_ = g_file_query_exists (_tmp26_, NULL); + if (g_file_query_exists (_tmp24_, NULL)) { #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp27_) { -#line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp25_ = TRUE; -#line 494 "AppDirs.c" + _tmp23_ = TRUE; +#line 498 "AppDirs.c" } else { - GFile* _tmp28_; - gboolean _tmp29_; -#line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp28_ = old_dir; + GFile* _tmp25_; #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp29_ = g_file_query_exists (_tmp28_, NULL); + _tmp25_ = old_dir; #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp25_ = !_tmp29_; -#line 504 "AppDirs.c" + _tmp23_ = !g_file_query_exists (_tmp25_, NULL); +#line 505 "AppDirs.c" } #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp25_) { + if (_tmp23_) { #line 56 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (new_dir); #line 56 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -512,32 +513,28 @@ void app_dirs_try_migrate_data (void) { _g_object_unref0 (user_plugin_dir); #line 56 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 516 "AppDirs.c" +#line 517 "AppDirs.c" } #line 58 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp30_ = app_dirs_get_cache_dir (); + _tmp26_ = app_dirs_get_cache_dir (); #line 58 "/home/jens/Source/shotwell/src/AppDirs.vala" - cache_dir = _tmp30_; + cache_dir = _tmp26_; #line 59 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp31_ = umask ((mode_t) 0077); -#line 59 "/home/jens/Source/shotwell/src/AppDirs.vala" - mask = _tmp31_; -#line 60 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp32_ = cache_dir; + mask = umask ((mode_t) 0077); #line 60 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp33_ = g_file_query_exists (_tmp32_, NULL); + _tmp27_ = cache_dir; #line 60 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp33_) { -#line 532 "AppDirs.c" + if (!g_file_query_exists (_tmp27_, NULL)) { +#line 529 "AppDirs.c" { - GFile* _tmp34_; + GFile* _tmp28_; #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp34_ = cache_dir; + _tmp28_ = cache_dir; #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp34_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp28_, NULL, &_inner_error_); #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 541 "AppDirs.c" +#line 538 "AppDirs.c" goto __catch454_g_error; } } @@ -545,40 +542,40 @@ void app_dirs_try_migrate_data (void) { __catch454_g_error: { GError* err = NULL; - GFile* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; - GError* _tmp38_; - const gchar* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; + GFile* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + GError* _tmp32_; + const gchar* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; #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_ = cache_dir; + _tmp29_ = cache_dir; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp36_ = g_file_get_path (_tmp35_); + _tmp30_ = g_file_get_path (_tmp29_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp37_ = _tmp36_; + _tmp31_ = _tmp30_; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp38_ = err; + _tmp32_ = err; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp39_ = _tmp38_->message; + _tmp33_ = _tmp32_->message; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp40_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp37_, _tmp39_); + _tmp34_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp31_, _tmp33_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp41_ = _tmp40_; + _tmp35_ = _tmp34_; #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp41_); + app_window_panic (_tmp35_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp41_); + _g_free0 (_tmp35_); #line 64 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp31_); #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 582 "AppDirs.c" +#line 579 "AppDirs.c" } __finally454: #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -597,71 +594,69 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 601 "AppDirs.c" +#line 598 "AppDirs.c" } } #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp42_ = old_dir; + _tmp36_ = old_dir; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp43_ = g_file_get_child (_tmp42_, "thumbs"); + _tmp37_ = g_file_get_child (_tmp36_, "thumbs"); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp44_ = _tmp43_; + _tmp38_ = _tmp37_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp45_ = g_file_get_path (_tmp44_); + _tmp39_ = g_file_get_path (_tmp38_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp46_ = _tmp45_; + _tmp40_ = _tmp39_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp47_ = cache_dir; + _tmp41_ = cache_dir; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp48_ = g_file_get_child (_tmp47_, "thumbs"); + _tmp42_ = g_file_get_child (_tmp41_, "thumbs"); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp49_ = _tmp48_; + _tmp43_ = _tmp42_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp50_ = g_file_get_path (_tmp49_); + _tmp44_ = g_file_get_path (_tmp43_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp51_ = _tmp50_; + _tmp45_ = _tmp44_; #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_rename (_tmp46_, _tmp51_); + g_rename (_tmp40_, _tmp45_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp51_); + _g_free0 (_tmp45_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp49_); + _g_object_unref0 (_tmp43_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp40_); #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp44_); + _g_object_unref0 (_tmp38_); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp52_ = new_dir; + _tmp46_ = new_dir; #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp53_ = g_file_get_parent (_tmp52_); + _tmp47_ = g_file_get_parent (_tmp46_); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp54_ = _tmp53_; + _tmp48_ = _tmp47_; #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp55_ = g_file_query_exists (_tmp54_, NULL); + _tmp49_ = !g_file_query_exists (_tmp48_, NULL); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp56_ = !_tmp55_; + _g_object_unref0 (_tmp48_); #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp54_); -#line 70 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp56_) { -#line 648 "AppDirs.c" + if (_tmp49_) { +#line 643 "AppDirs.c" { - GFile* _tmp57_; - GFile* _tmp58_; - GFile* _tmp59_; + GFile* _tmp50_; + GFile* _tmp51_; + GFile* _tmp52_; #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp57_ = new_dir; + _tmp50_ = new_dir; #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp58_ = g_file_get_parent (_tmp57_); + _tmp51_ = g_file_get_parent (_tmp50_); #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp59_ = _tmp58_; + _tmp52_ = _tmp51_; #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp59_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp52_, NULL, &_inner_error_); #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp59_); + _g_object_unref0 (_tmp52_); #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 665 "AppDirs.c" +#line 660 "AppDirs.c" goto __catch455_g_error; } } @@ -669,48 +664,48 @@ void app_dirs_try_migrate_data (void) { __catch455_g_error: { GError* err = NULL; - GFile* _tmp60_; - GFile* _tmp61_; - GFile* _tmp62_; - gchar* _tmp63_; - gchar* _tmp64_; - GError* _tmp65_; - const gchar* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; + GFile* _tmp53_; + GFile* _tmp54_; + GFile* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + GError* _tmp58_; + const gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; #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" - _tmp60_ = new_dir; + _tmp53_ = new_dir; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp61_ = g_file_get_parent (_tmp60_); + _tmp54_ = g_file_get_parent (_tmp53_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp62_ = _tmp61_; + _tmp55_ = _tmp54_; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp63_ = g_file_get_path (_tmp62_); + _tmp56_ = g_file_get_path (_tmp55_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp64_ = _tmp63_; + _tmp57_ = _tmp56_; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp65_ = err; + _tmp58_ = err; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp66_ = _tmp65_->message; + _tmp59_ = _tmp58_->message; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp67_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp64_, _tmp66_); + _tmp60_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp57_, _tmp59_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp68_ = _tmp67_; + _tmp61_ = _tmp60_; #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp68_); + app_window_panic (_tmp61_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp68_); + _g_free0 (_tmp61_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp64_); + _g_free0 (_tmp57_); #line 74 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp62_); + _g_object_unref0 (_tmp55_); #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 714 "AppDirs.c" +#line 709 "AppDirs.c" } __finally455: #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -729,41 +724,41 @@ void app_dirs_try_migrate_data (void) { g_clear_error (&_inner_error_); #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 733 "AppDirs.c" +#line 728 "AppDirs.c" } } #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp69_ = old_dir; + _tmp62_ = old_dir; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp70_ = g_file_get_path (_tmp69_); + _tmp63_ = g_file_get_path (_tmp62_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp71_ = _tmp70_; + _tmp64_ = _tmp63_; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp72_ = new_dir; + _tmp65_ = new_dir; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp73_ = g_file_get_path (_tmp72_); + _tmp66_ = g_file_get_path (_tmp65_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp74_ = _tmp73_; + _tmp67_ = _tmp66_; #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_rename (_tmp71_, _tmp74_); + g_rename (_tmp64_, _tmp67_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp74_); + _g_free0 (_tmp67_); #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp71_); + _g_free0 (_tmp64_); #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp75_ = new_dir; + _tmp68_ = new_dir; #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp76_ = g_file_get_path (_tmp75_); + _tmp69_ = g_file_get_path (_tmp68_); #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp77_ = _tmp76_; + _tmp70_ = _tmp69_; #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_chmod (_tmp77_, 0700); + g_chmod (_tmp70_, 0700); #line 79 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp77_); + _g_free0 (_tmp70_); #line 81 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp78_ = mask; + _tmp71_ = mask; #line 81 "/home/jens/Source/shotwell/src/AppDirs.vala" - umask (_tmp78_); + umask (_tmp71_); #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (cache_dir); #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -772,96 +767,88 @@ 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 776 "AppDirs.c" +#line 771 "AppDirs.c" } -void app_dirs_set_data_dir (const gchar* user_data_dir) { - const gchar* _tmp0_; - gboolean _tmp1_; - GFile* _tmp2_; +void +app_dirs_set_data_dir (const gchar* user_data_dir) +{ + GFile* _tmp0_; gchar* path = NULL; - const gchar* _tmp3_; - gchar* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; - GFile* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + gchar* _tmp1_; + const gchar* _tmp2_; + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #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" - _tmp0_ = user_data_dir; -#line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" - _vala_return_if_fail (!_tmp1_, "!is_string_empty(user_data_dir)"); + _vala_return_if_fail (!is_string_empty (user_data_dir), "!is_string_empty(user_data_dir)"); #line 86 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = app_dirs_data_dir; + _tmp0_ = app_dirs_data_dir; #line 86 "/home/jens/Source/shotwell/src/AppDirs.vala" - _vala_assert (_tmp2_ == NULL, "data_dir == null"); + _vala_assert (_tmp0_ == NULL, "data_dir == null"); #line 89 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = user_data_dir; + _tmp1_ = strip_pretty_path (user_data_dir); #line 89 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = strip_pretty_path (_tmp3_); -#line 89 "/home/jens/Source/shotwell/src/AppDirs.vala" - path = _tmp4_; -#line 90 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = path; + path = _tmp1_; #line 90 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = g_path_is_absolute (_tmp5_); + _tmp2_ = path; #line 90 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp6_) { -#line 816 "AppDirs.c" - GFile* _tmp7_; - GFile* _tmp8_; - const gchar* _tmp9_; - GFile* _tmp10_; + if (!g_path_is_absolute (_tmp2_)) { +#line 801 "AppDirs.c" + GFile* _tmp3_; + GFile* _tmp4_; + const gchar* _tmp5_; + GFile* _tmp6_; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = app_dirs_get_home_dir (); + _tmp3_ = app_dirs_get_home_dir (); #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = path; + _tmp5_ = path; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_child (_tmp8_, _tmp9_); + _tmp6_ = g_file_get_child (_tmp4_, _tmp5_); #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (app_dirs_data_dir); #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_data_dir = _tmp10_; + app_dirs_data_dir = _tmp6_; #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp8_); -#line 835 "AppDirs.c" + _g_object_unref0 (_tmp4_); +#line 820 "AppDirs.c" } else { - const gchar* _tmp11_; - GFile* _tmp12_; + const gchar* _tmp7_; + GFile* _tmp8_; #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = path; + _tmp7_ = path; #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = g_file_new_for_path (_tmp11_); + _tmp8_ = g_file_new_for_path (_tmp7_); #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (app_dirs_data_dir); #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_data_dir = _tmp12_; -#line 847 "AppDirs.c" + app_dirs_data_dir = _tmp8_; +#line 832 "AppDirs.c" } #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = app_dirs_data_dir; + _tmp9_ = app_dirs_data_dir; #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp10_ = g_file_get_path (_tmp9_); #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_message ("AppDirs.vala:95: Setting private data directory to %s", _tmp15_); + g_message ("AppDirs.vala:95: Setting private data directory to %s", _tmp11_); #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp11_); #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); -#line 861 "AppDirs.c" +#line 846 "AppDirs.c" } -void app_dirs_verify_data_dir (void) { +void +app_dirs_verify_data_dir (void) +{ GFile* data_dir = NULL; GFile* _tmp0_; GError * _inner_error_ = NULL; @@ -869,25 +856,22 @@ void app_dirs_verify_data_dir (void) { _tmp0_ = app_dirs_get_data_dir (); #line 99 "/home/jens/Source/shotwell/src/AppDirs.vala" data_dir = _tmp0_; -#line 873 "AppDirs.c" +#line 860 "AppDirs.c" { 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 883 "AppDirs.c" - GFile* _tmp3_; + if (!g_file_query_exists (_tmp1_, NULL)) { +#line 867 "AppDirs.c" + GFile* _tmp2_; #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = data_dir; + _tmp2_ = data_dir; #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp2_, NULL, &_inner_error_); #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 891 "AppDirs.c" +#line 875 "AppDirs.c" goto __catch456_g_error; } } @@ -896,40 +880,40 @@ void app_dirs_verify_data_dir (void) { __catch456_g_error: { GError* err = NULL; - GFile* _tmp4_; + GFile* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp6_; + const gchar* _tmp7_; + 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_ = data_dir; + _tmp3_ = data_dir; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp4_ = g_file_get_path (_tmp3_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = err; + _tmp6_ = err; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = _tmp7_->message; + _tmp7_ = _tmp6_->message; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp6_, _tmp8_); + _tmp8_ = g_strdup_printf (_ ("Unable to create data directory %s: %s"), _tmp5_, _tmp7_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp10_); + app_window_panic (_tmp9_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 104 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 933 "AppDirs.c" +#line 917 "AppDirs.c" } __finally456: #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -942,15 +926,17 @@ void app_dirs_verify_data_dir (void) { g_clear_error (&_inner_error_); #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 946 "AppDirs.c" +#line 930 "AppDirs.c" } #line 98 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (data_dir); -#line 950 "AppDirs.c" +#line 934 "AppDirs.c" } -void app_dirs_verify_cache_dir (void) { +void +app_dirs_verify_cache_dir (void) +{ GFile* cache_dir = NULL; GFile* _tmp0_; GError * _inner_error_ = NULL; @@ -958,25 +944,22 @@ void app_dirs_verify_cache_dir (void) { _tmp0_ = app_dirs_get_cache_dir (); #line 110 "/home/jens/Source/shotwell/src/AppDirs.vala" cache_dir = _tmp0_; -#line 962 "AppDirs.c" +#line 948 "AppDirs.c" { 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 972 "AppDirs.c" - GFile* _tmp3_; + if (!g_file_query_exists (_tmp1_, NULL)) { +#line 955 "AppDirs.c" + GFile* _tmp2_; #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = cache_dir; + _tmp2_ = cache_dir; #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp2_, NULL, &_inner_error_); #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 980 "AppDirs.c" +#line 963 "AppDirs.c" goto __catch457_g_error; } } @@ -985,40 +968,40 @@ void app_dirs_verify_cache_dir (void) { __catch457_g_error: { GError* err = NULL; - GFile* _tmp4_; + GFile* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp6_; + const gchar* _tmp7_; + 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_ = cache_dir; + _tmp3_ = cache_dir; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = g_file_get_path (_tmp4_); + _tmp4_ = g_file_get_path (_tmp3_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = err; + _tmp6_ = err; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = _tmp7_->message; + _tmp7_ = _tmp6_->message; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp6_, _tmp8_); + _tmp8_ = g_strdup_printf (_ ("Unable to create cache directory %s: %s"), _tmp5_, _tmp7_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp10_); + app_window_panic (_tmp9_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 115 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1022 "AppDirs.c" +#line 1005 "AppDirs.c" } __finally457: #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1031,11 +1014,11 @@ void app_dirs_verify_cache_dir (void) { g_clear_error (&_inner_error_); #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 1035 "AppDirs.c" +#line 1018 "AppDirs.c" } #line 109 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (cache_dir); -#line 1039 "AppDirs.c" +#line 1022 "AppDirs.c" } @@ -1043,7 +1026,9 @@ void app_dirs_verify_cache_dir (void) { * @brief Returns the build directory if not installed yet, or a path * to where any helper applets we need will live if installed. */ -GFile* app_dirs_get_libexec_dir (void) { +GFile* +app_dirs_get_libexec_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp6_; @@ -1052,7 +1037,7 @@ GFile* app_dirs_get_libexec_dir (void) { _tmp0_ = app_dirs_libexec_dir; #line 125 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp0_ == NULL) { -#line 1056 "AppDirs.c" +#line 1041 "AppDirs.c" GFile* _tmp1_; GFile* _tmp2_; gboolean _tmp3_; @@ -1066,7 +1051,7 @@ GFile* app_dirs_get_libexec_dir (void) { _g_object_unref0 (_tmp2_); #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp3_) { -#line 1070 "AppDirs.c" +#line 1055 "AppDirs.c" GFile* _tmp4_; #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = app_dirs_get_exec_dir (); @@ -1074,7 +1059,7 @@ GFile* app_dirs_get_libexec_dir (void) { _g_object_unref0 (app_dirs_libexec_dir); #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_libexec_dir = _tmp4_; -#line 1078 "AppDirs.c" +#line 1063 "AppDirs.c" } else { GFile* _tmp5_; #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1083,7 +1068,7 @@ GFile* app_dirs_get_libexec_dir (void) { _g_object_unref0 (app_dirs_libexec_dir); #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_libexec_dir = _tmp5_; -#line 1087 "AppDirs.c" +#line 1072 "AppDirs.c" } } #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1094,11 +1079,13 @@ GFile* app_dirs_get_libexec_dir (void) { result = _tmp7_; #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1098 "AppDirs.c" +#line 1083 "AppDirs.c" } -GFile* app_dirs_get_install_dir (void) { +GFile* +app_dirs_get_install_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -1110,11 +1097,13 @@ GFile* app_dirs_get_install_dir (void) { result = _tmp1_; #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1114 "AppDirs.c" +#line 1101 "AppDirs.c" } -GFile* app_dirs_get_data_dir (void) { +GFile* +app_dirs_get_data_dir (void) +{ GFile* result = NULL; GFile* _tmp0_ = NULL; GFile* _tmp1_; @@ -1122,7 +1111,7 @@ GFile* app_dirs_get_data_dir (void) { _tmp1_ = app_dirs_data_dir; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp1_ == NULL) { -#line 1126 "AppDirs.c" +#line 1115 "AppDirs.c" const gchar* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; @@ -1141,7 +1130,7 @@ GFile* app_dirs_get_data_dir (void) { _tmp0_ = _tmp5_; #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp4_); -#line 1145 "AppDirs.c" +#line 1134 "AppDirs.c" } else { GFile* _tmp6_; GFile* _tmp7_; @@ -1153,17 +1142,19 @@ GFile* app_dirs_get_data_dir (void) { _g_object_unref0 (_tmp0_); #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = _tmp7_; -#line 1157 "AppDirs.c" +#line 1146 "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 1163 "AppDirs.c" +#line 1152 "AppDirs.c" } -GFile* app_dirs_get_import_dir (void) { +GFile* +app_dirs_get_import_dir (void) +{ GFile* result = NULL; gchar* path = NULL; ConfigFacade* _tmp0_; @@ -1171,15 +1162,13 @@ GFile* app_dirs_get_import_dir (void) { gchar* _tmp2_; gchar* _tmp3_; const gchar* _tmp4_; - gboolean _tmp5_; + const gchar* _tmp15_; + gchar* _tmp16_; const gchar* _tmp17_; - gchar* _tmp18_; - const gchar* _tmp19_; - gboolean _tmp20_; + GFile* _tmp20_; + GFile* _tmp21_; + GFile* _tmp22_; 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" @@ -1195,118 +1184,113 @@ GFile* app_dirs_get_import_dir (void) { #line 150 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = path; #line 150 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = is_string_empty (_tmp4_); -#line 150 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp5_) { -#line 1202 "AppDirs.c" - const gchar* _tmp6_; - gchar* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; - const gchar* _tmp15_; - GFile* _tmp16_; + if (!is_string_empty (_tmp4_)) { +#line 1189 "AppDirs.c" + const gchar* _tmp5_; + gchar* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp13_; + GFile* _tmp14_; #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = path; + _tmp5_ = path; #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = strip_pretty_path (_tmp6_); + _tmp6_ = strip_pretty_path (_tmp5_); #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 152 "/home/jens/Source/shotwell/src/AppDirs.vala" - path = _tmp7_; -#line 155 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = path; + path = _tmp6_; #line 155 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_path_is_absolute (_tmp8_); + _tmp7_ = path; #line 155 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp9_) { -#line 1223 "AppDirs.c" - GFile* _tmp10_; + if (!g_path_is_absolute (_tmp7_)) { +#line 1207 "AppDirs.c" + GFile* _tmp8_; + GFile* _tmp9_; + const gchar* _tmp10_; GFile* _tmp11_; - const gchar* _tmp12_; - GFile* _tmp13_; - GFile* _tmp14_; + GFile* _tmp12_; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = app_dirs_get_home_dir (); + _tmp8_ = app_dirs_get_home_dir (); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = path; + _tmp10_ = path; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_file_get_child (_tmp11_, _tmp12_); + _tmp11_ = g_file_get_child (_tmp9_, _tmp10_); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp14_; + result = _tmp12_; #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1247 "AppDirs.c" +#line 1231 "AppDirs.c" } #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = path; + _tmp13_ = path; #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = g_file_new_for_path (_tmp15_); + _tmp14_ = g_file_new_for_path (_tmp13_); #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp16_; + result = _tmp14_; #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1259 "AppDirs.c" +#line 1243 "AppDirs.c" } #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); + _tmp15_ = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala" - path = _tmp18_; + path = _tmp16_; #line 164 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = path; + _tmp17_ = path; #line 164 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = is_string_empty (_tmp19_); -#line 164 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp20_) { -#line 1275 "AppDirs.c" - const gchar* _tmp21_; - GFile* _tmp22_; + if (!is_string_empty (_tmp17_)) { +#line 1257 "AppDirs.c" + const gchar* _tmp18_; + GFile* _tmp19_; #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = path; + _tmp18_ = path; #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp22_ = g_file_new_for_path (_tmp21_); + _tmp19_ = g_file_new_for_path (_tmp18_); #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp22_; + result = _tmp19_; #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1288 "AppDirs.c" +#line 1270 "AppDirs.c" } #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp23_ = app_dirs_get_home_dir (); + _tmp20_ = app_dirs_get_home_dir (); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp25_ = g_file_get_child (_tmp24_, _ ("Pictures")); + _tmp22_ = g_file_get_child (_tmp21_, _ ("Pictures")); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp21_); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp26_; + result = _tmp23_; #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (path); #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1306 "AppDirs.c" +#line 1288 "AppDirs.c" } -GFile* app_dirs_get_baked_import_dir (time_t tm) { +GFile* +app_dirs_get_baked_import_dir (time_t tm) +{ GFile* result = NULL; gchar* pattern = NULL; ConfigFacade* _tmp0_; @@ -1314,25 +1298,22 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) { gchar* _tmp2_; gchar* _tmp3_; const gchar* _tmp4_; - gboolean _tmp5_; - const gchar* _tmp9_; - gboolean _tmp10_; + const gchar* _tmp8_; GDateTime* date = NULL; - time_t _tmp12_; - GDateTime* _tmp13_; - GFile* _tmp14_; - GFile* _tmp15_; + GDateTime* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; + const gchar* _tmp17_; gchar* _tmp18_; gchar* _tmp19_; - const gchar* _tmp20_; + gchar* _tmp20_; gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - GFile* _tmp25_; - GFile* _tmp26_; + GFile* _tmp22_; + GFile* _tmp23_; #line 173 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = config_facade_get_instance (); #line 173 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1348,105 +1329,99 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) { #line 174 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = pattern; #line 174 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = is_string_empty (_tmp4_); -#line 174 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp5_) { -#line 1355 "AppDirs.c" + if (is_string_empty (_tmp4_)) { +#line 1334 "AppDirs.c" + ConfigFacade* _tmp5_; ConfigFacade* _tmp6_; - ConfigFacade* _tmp7_; - gchar* _tmp8_; + gchar* _tmp7_; #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = config_facade_get_instance (); + _tmp5_ = config_facade_get_instance (); #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp7_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (pattern); #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - pattern = _tmp8_; + pattern = _tmp7_; #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp7_); -#line 1371 "AppDirs.c" + _g_object_unref0 (_tmp6_); +#line 1350 "AppDirs.c" } #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = pattern; -#line 176 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = is_string_empty (_tmp9_); + _tmp8_ = pattern; #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp10_) { -#line 1379 "AppDirs.c" - gchar* _tmp11_; + if (is_string_empty (_tmp8_)) { +#line 1356 "AppDirs.c" + gchar* _tmp9_; #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = g_strdup ("%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d"); + _tmp9_ = 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 1387 "AppDirs.c" + pattern = _tmp9_; +#line 1364 "AppDirs.c" } #line 179 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = tm; + _tmp10_ = g_date_time_new_from_unix_local ((gint64) tm); #line 179 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_date_time_new_from_unix_local ((gint64) _tmp12_); -#line 179 "/home/jens/Source/shotwell/src/AppDirs.vala" - date = _tmp13_; -#line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = app_dirs_get_import_dir (); + date = _tmp10_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp11_ = app_dirs_get_import_dir (); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = g_file_get_path (_tmp15_); + _tmp12_ = _tmp11_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _tmp16_; + _tmp13_ = g_file_get_path (_tmp12_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = g_strconcat (_tmp17_, G_DIR_SEPARATOR_S, NULL); + _tmp14_ = _tmp13_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = _tmp18_; + _tmp15_ = g_strconcat (_tmp14_, G_DIR_SEPARATOR_S, NULL); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = pattern; + _tmp16_ = _tmp15_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = g_date_time_format (date, _tmp20_); + _tmp17_ = pattern; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp22_ = _tmp21_; + _tmp18_ = g_date_time_format (date, _tmp17_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp23_ = g_strconcat (_tmp19_, _tmp22_, NULL); + _tmp19_ = _tmp18_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp24_ = _tmp23_; + _tmp20_ = g_strconcat (_tmp16_, _tmp19_, NULL); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp25_ = g_file_new_for_path (_tmp24_); + _tmp21_ = _tmp20_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp26_ = _tmp25_; + _tmp22_ = g_file_new_for_path (_tmp21_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp24_); + _tmp23_ = _tmp22_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp19_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp16_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp15_); + _g_free0 (_tmp14_); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp26_; + _g_object_unref0 (_tmp12_); +#line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" + result = _tmp23_; #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_date_time_unref0 (date); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (pattern); #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1439 "AppDirs.c" +#line 1414 "AppDirs.c" } -gboolean app_dirs_is_in_import_dir (GFile* file) { +gboolean +app_dirs_is_in_import_dir (GFile* file) +{ gboolean result = FALSE; GFile* import_dir = NULL; GFile* _tmp0_; gboolean _tmp1_ = 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" @@ -1454,29 +1429,19 @@ gboolean app_dirs_is_in_import_dir (GFile* file) { #line 185 "/home/jens/Source/shotwell/src/AppDirs.vala" import_dir = _tmp0_; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = file; + _tmp2_ = import_dir; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = import_dir; -#line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = g_file_has_prefix (_tmp2_, _tmp3_); -#line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp4_) { + if (g_file_has_prefix (file, _tmp2_)) { #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = TRUE; -#line 1467 "AppDirs.c" +#line 1438 "AppDirs.c" } else { - 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" - _tmp6_ = import_dir; + GFile* _tmp3_; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = g_file_equal (_tmp5_, _tmp6_); + _tmp3_ = import_dir; #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = _tmp7_; -#line 1480 "AppDirs.c" + _tmp1_ = g_file_equal (file, _tmp3_); +#line 1445 "AppDirs.c" } #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp1_; @@ -1484,14 +1449,15 @@ 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 1488 "AppDirs.c" +#line 1453 "AppDirs.c" } -void app_dirs_set_import_dir (const gchar* path) { +void +app_dirs_set_import_dir (const gchar* path) +{ 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" @@ -1499,16 +1465,16 @@ void app_dirs_set_import_dir (const gchar* path) { #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = path; -#line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" - configuration_facade_set_import_dir (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_); + configuration_facade_set_import_dir (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), path); #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); -#line 1508 "AppDirs.c" +#line 1472 "AppDirs.c" } -GFile* app_dirs_get_exec_dir (void) { +GFile* +app_dirs_get_exec_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -1520,21 +1486,23 @@ GFile* app_dirs_get_exec_dir (void) { result = _tmp1_; #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1524 "AppDirs.c" +#line 1490 "AppDirs.c" } -GFile* app_dirs_get_temp_dir (void) { +GFile* +app_dirs_get_temp_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; + GFile* _tmp15_; 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 1538 "AppDirs.c" +#line 1506 "AppDirs.c" const gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; @@ -1556,25 +1524,22 @@ 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 1560 "AppDirs.c" +#line 1528 "AppDirs.c" { 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 1570 "AppDirs.c" - GFile* _tmp8_; + if (!g_file_query_exists (_tmp6_, NULL)) { +#line 1535 "AppDirs.c" + GFile* _tmp7_; #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = app_dirs_tmp_dir; + _tmp7_ = app_dirs_tmp_dir; #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp8_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp7_, NULL, &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1578 "AppDirs.c" +#line 1543 "AppDirs.c" goto __catch458_g_error; } } @@ -1583,40 +1548,40 @@ GFile* app_dirs_get_temp_dir (void) { __catch458_g_error: { GError* err = NULL; - GFile* _tmp9_; + GFile* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - GError* _tmp12_; - const gchar* _tmp13_; + GError* _tmp11_; + const gchar* _tmp12_; + 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_ = app_dirs_tmp_dir; + _tmp8_ = app_dirs_tmp_dir; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_path (_tmp9_); + _tmp9_ = g_file_get_path (_tmp8_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = err; + _tmp11_ = err; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = _tmp12_->message; + _tmp12_ = _tmp11_->message; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_strdup_printf (_ ("Unable to create temporary directory %s: %s"), _tmp11_, _tmp13_); + _tmp13_ = g_strdup_printf (_ ("Unable to create temporary directory %s: %s"), _tmp10_, _tmp12_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp15_); + app_window_panic (_tmp14_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 206 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1620 "AppDirs.c" +#line 1585 "AppDirs.c" } __finally458: #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1627,30 +1592,31 @@ GFile* app_dirs_get_temp_dir (void) { g_clear_error (&_inner_error_); #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 1631 "AppDirs.c" +#line 1596 "AppDirs.c" } } #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = app_dirs_tmp_dir; + _tmp15_ = app_dirs_tmp_dir; #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp17_; + result = _tmp16_; #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 1642 "AppDirs.c" +#line 1607 "AppDirs.c" } -GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { +GFile* +app_dirs_get_data_subdir (const gchar* name, + const gchar* subname) +{ GFile* result = NULL; GFile* subdir = NULL; GFile* _tmp0_; GFile* _tmp1_; - const gchar* _tmp2_; + GFile* _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); @@ -1659,53 +1625,43 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = name; -#line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = g_file_get_child (_tmp1_, _tmp2_); + _tmp2_ = g_file_get_child (_tmp1_, name); #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); #line 215 "/home/jens/Source/shotwell/src/AppDirs.vala" - subdir = _tmp4_; + subdir = _tmp3_; #line 216 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = subname; -#line 216 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp5_ != NULL) { -#line 1676 "AppDirs.c" - GFile* _tmp6_; - const gchar* _tmp7_; - GFile* _tmp8_; -#line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = subdir; + if (subname != NULL) { +#line 1638 "AppDirs.c" + GFile* _tmp4_; + GFile* _tmp5_; #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = subname; + _tmp4_ = subdir; #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = g_file_get_child (_tmp6_, _tmp7_); + _tmp5_ = g_file_get_child (_tmp4_, subname); #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (subdir); #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala" - subdir = _tmp8_; -#line 1690 "AppDirs.c" + subdir = _tmp5_; +#line 1649 "AppDirs.c" } { - GFile* _tmp9_; - gboolean _tmp10_; -#line 220 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = subdir; + GFile* _tmp6_; #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_query_exists (_tmp9_, NULL); + _tmp6_ = subdir; #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp10_) { -#line 1701 "AppDirs.c" - GFile* _tmp11_; + if (!g_file_query_exists (_tmp6_, NULL)) { +#line 1657 "AppDirs.c" + GFile* _tmp7_; #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = subdir; + _tmp7_ = subdir; #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp7_, NULL, &_inner_error_); #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1709 "AppDirs.c" +#line 1665 "AppDirs.c" goto __catch459_g_error; } } @@ -1714,40 +1670,40 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { __catch459_g_error: { GError* err = NULL; - GFile* _tmp12_; + GFile* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GError* _tmp11_; + const gchar* _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_ = subdir; + _tmp8_ = subdir; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_file_get_path (_tmp12_); + _tmp9_ = g_file_get_path (_tmp8_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = _tmp13_; -#line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = err; + _tmp10_ = _tmp9_; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = _tmp15_->message; + _tmp11_ = err; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp14_, _tmp16_); + _tmp12_ = _tmp11_->message; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = _tmp17_; + _tmp13_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp10_, _tmp12_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp18_); + _tmp14_ = _tmp13_; #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp18_); + app_window_panic (_tmp14_); #line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp14_); +#line 223 "/home/jens/Source/shotwell/src/AppDirs.vala" + _g_free0 (_tmp10_); #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1751 "AppDirs.c" +#line 1707 "AppDirs.c" } __finally459: #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1760,140 +1716,118 @@ 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 1764 "AppDirs.c" +#line 1720 "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 1770 "AppDirs.c" +#line 1726 "AppDirs.c" } -void app_dirs_ensure_writable (GFile* dir) { - GFile* _tmp0_; - gboolean _tmp1_; +void +app_dirs_ensure_writable (GFile* dir) +{ GError * _inner_error_ = NULL; #line 230 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (G_IS_FILE (dir)); #line 231 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp0_ = dir; -#line 231 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = g_file_query_exists (_tmp0_, NULL); -#line 231 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp1_) { -#line 1786 "AppDirs.c" + if (g_file_query_exists (dir, NULL)) { +#line 1738 "AppDirs.c" { GFileInfo* info = NULL; - GFile* _tmp2_; - GFileInfo* _tmp3_; + GFileInfo* _tmp0_; guint32 mode = 0U; - GFileInfo* _tmp4_; - guint32 _tmp5_; - gboolean _tmp6_ = FALSE; - GFile* _tmp7_; - guint32 _tmp8_; - gboolean _tmp9_; -#line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = dir; + GFileInfo* _tmp1_; + gboolean _tmp2_ = FALSE; + guint32 _tmp3_; #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = g_file_query_info (_tmp2_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); + _tmp0_ = g_file_query_info (dir, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" - info = _tmp3_; + info = _tmp0_; #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1806 "AppDirs.c" +#line 1752 "AppDirs.c" goto __catch460_g_error; } #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = info; + _tmp1_ = info; #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = g_file_info_get_attribute_uint32 (_tmp4_, G_FILE_ATTRIBUTE_UNIX_MODE); -#line 234 "/home/jens/Source/shotwell/src/AppDirs.vala" - mode = _tmp5_ | 0700; -#line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = dir; + mode = g_file_info_get_attribute_uint32 (_tmp1_, G_FILE_ATTRIBUTE_UNIX_MODE) | 0700; #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = mode; + _tmp3_ = mode; #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_file_set_attribute_uint32 (_tmp7_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp8_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); -#line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = _tmp9_; + _tmp2_ = g_file_set_attribute_uint32 (dir, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp3_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (info); -#line 1827 "AppDirs.c" +#line 1767 "AppDirs.c" goto __catch460_g_error; } #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp6_) { -#line 1832 "AppDirs.c" - GFile* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; -#line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = dir; + if (!_tmp2_) { +#line 1772 "AppDirs.c" + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = g_file_get_path (_tmp10_); + _tmp4_ = g_file_get_path (dir); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = _tmp11_; + _tmp5_ = _tmp4_; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = g_strdup_printf (_ ("Could not make directory %s writable"), _tmp12_); + _tmp6_ = g_strdup_printf (_ ("Could not make directory %s writable"), _tmp5_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = _tmp13_; + _tmp7_ = _tmp6_; #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp14_); + app_window_panic (_tmp7_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp7_); #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp12_); -#line 1854 "AppDirs.c" + _g_free0 (_tmp5_); +#line 1791 "AppDirs.c" } #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (info); -#line 1858 "AppDirs.c" +#line 1795 "AppDirs.c" } goto __finally460; __catch460_g_error: { GError* err = NULL; - GFile* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - GError* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; + gchar* _tmp8_; + gchar* _tmp9_; + GError* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #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" - _tmp15_ = dir; -#line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = g_file_get_path (_tmp15_); + _tmp8_ = g_file_get_path (dir); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _tmp16_; + _tmp9_ = _tmp8_; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = err; + _tmp10_ = err; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = _tmp18_->message; + _tmp11_ = _tmp10_->message; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = g_strdup_printf (_ ("Could not make directory %s writable: %s"), _tmp17_, _tmp19_); + _tmp12_ = g_strdup_printf (_ ("Could not make directory %s writable: %s"), _tmp9_, _tmp11_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp21_ = _tmp20_; + _tmp13_ = _tmp12_; #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp21_); + app_window_panic (_tmp13_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp13_); #line 239 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp9_); #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 1897 "AppDirs.c" +#line 1831 "AppDirs.c" } __finally460: #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1904,23 +1838,24 @@ void app_dirs_ensure_writable (GFile* dir) { g_clear_error (&_inner_error_); #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" return; -#line 1908 "AppDirs.c" +#line 1842 "AppDirs.c" } } } -GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { +GFile* +app_dirs_get_cache_subdir (const gchar* name, + const gchar* subname) +{ GFile* result = NULL; GFile* subdir = NULL; GFile* _tmp0_; GFile* _tmp1_; - const gchar* _tmp2_; + GFile* _tmp2_; GFile* _tmp3_; GFile* _tmp4_; - GFile* _tmp5_; - const gchar* _tmp6_; - GFile* _tmp20_; + GFile* _tmp16_; GError * _inner_error_ = NULL; #line 244 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (name != NULL, NULL); @@ -1929,57 +1864,47 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = name; -#line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = g_file_get_child (_tmp1_, _tmp2_); + _tmp2_ = g_file_get_child (_tmp1_, name); #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); #line 245 "/home/jens/Source/shotwell/src/AppDirs.vala" - subdir = _tmp4_; + subdir = _tmp3_; #line 246 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = subdir; + _tmp4_ = subdir; #line 246 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_ensure_writable (_tmp5_); -#line 247 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = subname; + app_dirs_ensure_writable (_tmp4_); #line 247 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp6_ != NULL) { -#line 1950 "AppDirs.c" - GFile* _tmp7_; - const gchar* _tmp8_; - GFile* _tmp9_; -#line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = subdir; + if (subname != NULL) { +#line 1881 "AppDirs.c" + GFile* _tmp5_; + GFile* _tmp6_; #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = subname; + _tmp5_ = subdir; #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = g_file_get_child (_tmp7_, _tmp8_); + _tmp6_ = g_file_get_child (_tmp5_, subname); #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (subdir); #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala" - subdir = _tmp9_; -#line 1964 "AppDirs.c" + subdir = _tmp6_; +#line 1892 "AppDirs.c" } { - GFile* _tmp10_; - gboolean _tmp11_; -#line 251 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = subdir; + GFile* _tmp7_; #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = g_file_query_exists (_tmp10_, NULL); + _tmp7_ = subdir; #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp11_) { -#line 1975 "AppDirs.c" - GFile* _tmp12_; + if (!g_file_query_exists (_tmp7_, NULL)) { +#line 1900 "AppDirs.c" + GFile* _tmp8_; #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = subdir; + _tmp8_ = subdir; #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" - g_file_make_directory_with_parents (_tmp12_, NULL, &_inner_error_); + g_file_make_directory_with_parents (_tmp8_, NULL, &_inner_error_); #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1983 "AppDirs.c" +#line 1908 "AppDirs.c" goto __catch461_g_error; } } @@ -1988,40 +1913,40 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { __catch461_g_error: { GError* err = NULL; - GFile* _tmp13_; + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GError* _tmp12_; + const gchar* _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_ = subdir; -#line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp9_ = subdir; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp10_ = g_file_get_path (_tmp9_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = err; + _tmp11_ = _tmp10_; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _tmp16_->message; + _tmp12_ = err; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp18_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp15_, _tmp17_); + _tmp13_ = _tmp12_->message; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp19_ = _tmp18_; + _tmp14_ = g_strdup_printf (_ ("Unable to create data subdirectory %s: %s"), _tmp11_, _tmp13_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_window_panic (_tmp19_); + _tmp15_ = _tmp14_; #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_free0 (_tmp19_); + app_window_panic (_tmp15_); #line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp15_); +#line 254 "/home/jens/Source/shotwell/src/AppDirs.vala" + _g_free0 (_tmp11_); #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_error_free0 (err); -#line 2025 "AppDirs.c" +#line 1950 "AppDirs.c" } __finally461: #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2034,30 +1959,32 @@ 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 2038 "AppDirs.c" +#line 1963 "AppDirs.c" } #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp20_ = subdir; + _tmp16_ = subdir; #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala" - app_dirs_ensure_writable (_tmp20_); + app_dirs_ensure_writable (_tmp16_); #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala" result = subdir; #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2048 "AppDirs.c" +#line 1973 "AppDirs.c" } -GFile* app_dirs_get_lib_dir (void) { +GFile* +app_dirs_get_lib_dir (void) +{ GFile* result = NULL; GFile* install_dir = NULL; GFile* _tmp0_; GFile* _tmp1_; + GFile* _tmp12_; GFile* _tmp13_; GFile* _tmp14_; GFile* _tmp15_; GFile* _tmp16_; - GFile* _tmp17_; #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_install_dir (); #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2066,14 +1993,13 @@ GFile* app_dirs_get_lib_dir (void) { _tmp1_ = install_dir; #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp1_ == NULL) { -#line 2070 "AppDirs.c" +#line 1997 "AppDirs.c" GFile* _tmp2_; GFile* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; gboolean _tmp6_; - gboolean _tmp7_; - GFile* _tmp12_; + GFile* _tmp11_; #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = app_dirs_get_exec_dir (); #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2085,69 +2011,69 @@ GFile* app_dirs_get_lib_dir (void) { #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = g_str_has_suffix (_tmp5_, "src"); #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = _tmp6_; -#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_free0 (_tmp5_); #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp3_); #line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp7_) { -#line 2096 "AppDirs.c" + if (_tmp6_) { +#line 2020 "AppDirs.c" + GFile* _tmp7_; GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; - GFile* _tmp11_; #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = app_dirs_get_exec_dir (); + _tmp7_ = app_dirs_get_exec_dir (); #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_parent (_tmp9_); + _tmp9_ = g_file_get_parent (_tmp8_); #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp11_; + result = _tmp10_; #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (install_dir); #line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2117 "AppDirs.c" +#line 2041 "AppDirs.c" } #line 271 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = app_dirs_get_exec_dir (); + _tmp11_ = app_dirs_get_exec_dir (); #line 271 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp12_; + result = _tmp11_; #line 271 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (install_dir); #line 271 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2127 "AppDirs.c" +#line 2051 "AppDirs.c" } #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp13_ = install_dir; + _tmp12_ = install_dir; #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp14_ = g_file_get_child (_tmp13_, RESOURCES_LIB); + _tmp13_ = g_file_get_child (_tmp12_, RESOURCES_LIB); #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp16_ = g_file_get_child (_tmp15_, "shotwell"); + _tmp15_ = g_file_get_child (_tmp14_, "shotwell"); #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp17_; + result = _tmp16_; #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (install_dir); #line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2147 "AppDirs.c" +#line 2071 "AppDirs.c" } -GFile* app_dirs_get_system_plugins_dir (void) { +GFile* +app_dirs_get_system_plugins_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2167,11 +2093,13 @@ GFile* app_dirs_get_system_plugins_dir (void) { result = _tmp3_; #line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2171 "AppDirs.c" +#line 2097 "AppDirs.c" } -GFile* app_dirs_get_user_plugins_dir (void) { +GFile* +app_dirs_get_user_plugins_dir (void) +{ GFile* result = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2191,18 +2119,20 @@ GFile* app_dirs_get_user_plugins_dir (void) { result = _tmp3_; #line 282 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2195 "AppDirs.c" +#line 2123 "AppDirs.c" } -GFile* app_dirs_get_log_file (void) { +GFile* +app_dirs_get_log_file (void) +{ GFile* result = NULL; const gchar* _tmp0_; #line 286 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = g_getenv ("SHOTWELL_LOG_FILE"); #line 286 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp0_ != NULL) { -#line 2206 "AppDirs.c" +#line 2136 "AppDirs.c" const gchar* _tmp1_; #line 287 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = g_getenv ("SHOTWELL_LOG_FILE"); @@ -2212,7 +2142,7 @@ GFile* app_dirs_get_log_file (void) { result = NULL; #line 288 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2216 "AppDirs.c" +#line 2146 "AppDirs.c" } else { const gchar* _tmp2_; GFile* _tmp3_; @@ -2224,7 +2154,7 @@ GFile* app_dirs_get_log_file (void) { result = _tmp3_; #line 290 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2228 "AppDirs.c" +#line 2158 "AppDirs.c" } } else { const gchar* _tmp4_; @@ -2256,16 +2186,18 @@ GFile* app_dirs_get_log_file (void) { result = _tmp10_; #line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2260 "AppDirs.c" +#line 2190 "AppDirs.c" } } -GFile* app_dirs_get_thumbnailer_bin (void) { +GFile* +app_dirs_get_thumbnailer_bin (void) +{ GFile* result = NULL; #line 299 "/home/jens/Source/shotwell/src/AppDirs.vala" static const char filename[] = "shotwell-video-thumbnailer"; -#line 2269 "AppDirs.c" +#line 2201 "AppDirs.c" GFile* f = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2274,7 +2206,6 @@ GFile* app_dirs_get_thumbnailer_bin (void) { GFile* _tmp4_; GFile* _tmp5_; GFile* _tmp6_; - gboolean _tmp7_; #line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_libexec_dir (); #line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2296,48 +2227,48 @@ GFile* app_dirs_get_thumbnailer_bin (void) { #line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = f; #line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = g_file_query_exists (_tmp6_, NULL); -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp7_) { -#line 2303 "AppDirs.c" + if (!g_file_query_exists (_tmp6_, NULL)) { +#line 2232 "AppDirs.c" + GFile* _tmp7_; GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; GFile* _tmp11_; - GFile* _tmp12_; #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = app_dirs_get_libexec_dir (); + _tmp7_ = app_dirs_get_libexec_dir (); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_child (_tmp9_, "shotwell"); + _tmp9_ = g_file_get_child (_tmp8_, "shotwell"); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = g_file_get_child (_tmp11_, filename); + _tmp11_ = g_file_get_child (_tmp10_, filename); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (f); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - f = _tmp12_; + f = _tmp11_; #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp9_); -#line 2327 "AppDirs.c" + _g_object_unref0 (_tmp8_); +#line 2256 "AppDirs.c" } #line 305 "/home/jens/Source/shotwell/src/AppDirs.vala" result = f; #line 305 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2333 "AppDirs.c" +#line 2262 "AppDirs.c" } -GFile* app_dirs_get_settings_migrator_bin (void) { +GFile* +app_dirs_get_settings_migrator_bin (void) +{ GFile* result = NULL; #line 309 "/home/jens/Source/shotwell/src/AppDirs.vala" static const char filename[] = "shotwell-settings-migrator"; -#line 2341 "AppDirs.c" +#line 2272 "AppDirs.c" GFile* f = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2346,7 +2277,6 @@ GFile* app_dirs_get_settings_migrator_bin (void) { GFile* _tmp4_; GFile* _tmp5_; GFile* _tmp6_; - gboolean _tmp7_; #line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_libexec_dir (); #line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2368,158 +2298,185 @@ GFile* app_dirs_get_settings_migrator_bin (void) { #line 311 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = f; #line 311 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = g_file_query_exists (_tmp6_, NULL); -#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (!_tmp7_) { -#line 2375 "AppDirs.c" + if (!g_file_query_exists (_tmp6_, NULL)) { +#line 2303 "AppDirs.c" + GFile* _tmp7_; GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; GFile* _tmp11_; - GFile* _tmp12_; #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp8_ = app_dirs_get_libexec_dir (); + _tmp7_ = app_dirs_get_libexec_dir (); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp10_ = g_file_get_child (_tmp9_, "shotwell"); + _tmp9_ = g_file_get_child (_tmp8_, "shotwell"); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp12_ = g_file_get_child (_tmp11_, filename); + _tmp11_ = g_file_get_child (_tmp10_, filename); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (f); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - f = _tmp12_; + f = _tmp11_; #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp9_); -#line 2399 "AppDirs.c" + _g_object_unref0 (_tmp8_); +#line 2327 "AppDirs.c" } #line 315 "/home/jens/Source/shotwell/src/AppDirs.vala" result = f; #line 315 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2405 "AppDirs.c" +#line 2333 "AppDirs.c" } -AppDirs* app_dirs_construct (GType object_type) { +AppDirs* +app_dirs_construct (GType object_type) +{ AppDirs* self = NULL; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" self = (AppDirs*) g_type_create_instance (object_type); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return self; -#line 2415 "AppDirs.c" +#line 2345 "AppDirs.c" } -AppDirs* app_dirs_new (void) { +AppDirs* +app_dirs_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return app_dirs_construct (TYPE_APP_DIRS); -#line 2422 "AppDirs.c" +#line 2354 "AppDirs.c" } -static void value_app_dirs_init (GValue* value) { +static void +value_app_dirs_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2429 "AppDirs.c" +#line 2363 "AppDirs.c" } -static void value_app_dirs_free_value (GValue* value) { +static void +value_app_dirs_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_unref (value->data[0].v_pointer); -#line 2438 "AppDirs.c" +#line 2374 "AppDirs.c" } } -static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_app_dirs_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" 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 2448 "AppDirs.c" +#line 2387 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" dest_value->data[0].v_pointer = NULL; -#line 2452 "AppDirs.c" +#line 2391 "AppDirs.c" } } -static gpointer value_app_dirs_peek_pointer (const GValue* value) { +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 2460 "AppDirs.c" +#line 2401 "AppDirs.c" } -static gchar* value_app_dirs_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 2467 "AppDirs.c" +#line 2413 "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 2474 "AppDirs.c" +#line 2420 "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 2478 "AppDirs.c" +#line 2424 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = app_dirs_ref (object); -#line 2482 "AppDirs.c" +#line 2428 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2486 "AppDirs.c" +#line 2432 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2490 "AppDirs.c" +#line 2436 "AppDirs.c" } -static gchar* value_app_dirs_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_app_dirs_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ 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 2501 "AppDirs.c" +#line 2452 "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 2507 "AppDirs.c" +#line 2458 "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 2511 "AppDirs.c" +#line 2462 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" *object_p = app_dirs_ref (value->data[0].v_pointer); -#line 2515 "AppDirs.c" +#line 2466 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2519 "AppDirs.c" +#line 2470 "AppDirs.c" } -GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_app_dirs (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAppDirs* spec; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_APP_DIRS), NULL); @@ -2529,20 +2486,25 @@ 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 2533 "AppDirs.c" +#line 2490 "AppDirs.c" } -gpointer value_get_app_dirs (const GValue* value) { +gpointer +value_get_app_dirs (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" 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 2542 "AppDirs.c" +#line 2501 "AppDirs.c" } -void value_set_app_dirs (GValue* value, gpointer v_object) { +void +value_set_app_dirs (GValue* value, + gpointer v_object) +{ AppDirs * old; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS)); @@ -2558,22 +2520,25 @@ 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 2562 "AppDirs.c" +#line 2524 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2566 "AppDirs.c" +#line 2528 "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 2572 "AppDirs.c" +#line 2534 "AppDirs.c" } } -void value_take_app_dirs (GValue* value, gpointer v_object) { +void +value_take_app_dirs (GValue* value, + gpointer v_object) +{ AppDirs * old; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS)); @@ -2587,48 +2552,56 @@ 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 2591 "AppDirs.c" +#line 2556 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2595 "AppDirs.c" +#line 2560 "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 2601 "AppDirs.c" +#line 2566 "AppDirs.c" } } -static void app_dirs_class_init (AppDirsClass * klass) { +static void +app_dirs_class_init (AppDirsClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" 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 2611 "AppDirs.c" +#line 2578 "AppDirs.c" } -static void app_dirs_instance_init (AppDirs * self) { +static void +app_dirs_instance_init (AppDirs * self) +{ #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" self->ref_count = 1; -#line 2618 "AppDirs.c" +#line 2587 "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 2628 "AppDirs.c" +#line 2599 "AppDirs.c" } -GType app_dirs_get_type (void) { +GType +app_dirs_get_type (void) +{ static volatile gsize app_dirs_type_id__volatile = 0; if (g_once_init_enter (&app_dirs_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_app_dirs_init, value_app_dirs_free_value, value_app_dirs_copy_value, value_app_dirs_peek_pointer, "p", value_app_dirs_collect_value, "p", value_app_dirs_lcopy_value }; @@ -2642,18 +2615,22 @@ GType app_dirs_get_type (void) { } -gpointer app_dirs_ref (gpointer instance) { +gpointer +app_dirs_ref (gpointer instance) +{ 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 2653 "AppDirs.c" +#line 2628 "AppDirs.c" } -void app_dirs_unref (gpointer instance) { +void +app_dirs_unref (gpointer instance) +{ AppDirs * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2662,7 +2639,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 2666 "AppDirs.c" +#line 2643 "AppDirs.c" } } |