From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/AppDirs.c | 459 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 252 insertions(+), 207 deletions(-) (limited to 'src/AppDirs.c') diff --git a/src/AppDirs.c b/src/AppDirs.c index e305d97..97986d0 100644 --- a/src/AppDirs.c +++ b/src/AppDirs.c @@ -393,11 +393,11 @@ void app_dirs_try_migrate_data (void) { #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 396 "AppDirs.c" - goto __catch444_g_error; + goto __catch452_g_error; } } - goto __finally444; - __catch444_g_error: + goto __finally452; + __catch452_g_error: { GError* err = NULL; #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -408,7 +408,7 @@ void app_dirs_try_migrate_data (void) { _g_error_free0 (err); #line 410 "AppDirs.c" } - __finally444: + __finally452: #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -436,11 +436,11 @@ void app_dirs_try_migrate_data (void) { #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 439 "AppDirs.c" - goto __catch445_g_error; + goto __catch453_g_error; } } - goto __finally445; - __catch445_g_error: + goto __finally453; + __catch453_g_error: { GError* err = NULL; #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -451,7 +451,7 @@ void app_dirs_try_migrate_data (void) { _g_error_free0 (err); #line 453 "AppDirs.c" } - __finally445: + __finally453: #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -538,11 +538,11 @@ void app_dirs_try_migrate_data (void) { #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 541 "AppDirs.c" - goto __catch446_g_error; + goto __catch454_g_error; } } - goto __finally446; - __catch446_g_error: + goto __finally454; + __catch454_g_error: { GError* err = NULL; GFile* _tmp35_; @@ -580,7 +580,7 @@ void app_dirs_try_migrate_data (void) { _g_error_free0 (err); #line 582 "AppDirs.c" } - __finally446: + __finally454: #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -662,11 +662,11 @@ void app_dirs_try_migrate_data (void) { #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 665 "AppDirs.c" - goto __catch447_g_error; + goto __catch455_g_error; } } - goto __finally447; - __catch447_g_error: + goto __finally455; + __catch455_g_error: { GError* err = NULL; GFile* _tmp60_; @@ -712,7 +712,7 @@ void app_dirs_try_migrate_data (void) { _g_error_free0 (err); #line 714 "AppDirs.c" } - __finally447: + __finally455: #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -888,12 +888,12 @@ void app_dirs_verify_data_dir (void) { #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 891 "AppDirs.c" - goto __catch448_g_error; + goto __catch456_g_error; } } } - goto __finally448; - __catch448_g_error: + goto __finally456; + __catch456_g_error: { GError* err = NULL; GFile* _tmp4_; @@ -931,7 +931,7 @@ void app_dirs_verify_data_dir (void) { _g_error_free0 (err); #line 933 "AppDirs.c" } - __finally448: + __finally456: #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -977,12 +977,12 @@ void app_dirs_verify_cache_dir (void) { #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 980 "AppDirs.c" - goto __catch449_g_error; + goto __catch457_g_error; } } } - goto __finally449; - __catch449_g_error: + goto __finally457; + __catch457_g_error: { GError* err = NULL; GFile* _tmp4_; @@ -1020,7 +1020,7 @@ void app_dirs_verify_cache_dir (void) { _g_error_free0 (err); #line 1022 "AppDirs.c" } - __finally449: + __finally457: #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1575,12 +1575,12 @@ GFile* app_dirs_get_temp_dir (void) { #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1578 "AppDirs.c" - goto __catch450_g_error; + goto __catch458_g_error; } } } - goto __finally450; - __catch450_g_error: + goto __finally458; + __catch458_g_error: { GError* err = NULL; GFile* _tmp9_; @@ -1618,7 +1618,7 @@ GFile* app_dirs_get_temp_dir (void) { _g_error_free0 (err); #line 1620 "AppDirs.c" } - __finally450: + __finally458: #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1706,12 +1706,12 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1709 "AppDirs.c" - goto __catch451_g_error; + goto __catch459_g_error; } } } - goto __finally451; - __catch451_g_error: + goto __finally459; + __catch459_g_error: { GError* err = NULL; GFile* _tmp12_; @@ -1749,7 +1749,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) { _g_error_free0 (err); #line 1751 "AppDirs.c" } - __finally451: + __finally459: #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1803,7 +1803,7 @@ void app_dirs_ensure_writable (GFile* dir) { #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1806 "AppDirs.c" - goto __catch452_g_error; + goto __catch460_g_error; } #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = info; @@ -1824,7 +1824,7 @@ void app_dirs_ensure_writable (GFile* dir) { #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (info); #line 1827 "AppDirs.c" - goto __catch452_g_error; + goto __catch460_g_error; } #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp6_) { @@ -1856,8 +1856,8 @@ void app_dirs_ensure_writable (GFile* dir) { _g_object_unref0 (info); #line 1858 "AppDirs.c" } - goto __finally452; - __catch452_g_error: + goto __finally460; + __catch460_g_error: { GError* err = NULL; GFile* _tmp15_; @@ -1895,7 +1895,7 @@ void app_dirs_ensure_writable (GFile* dir) { _g_error_free0 (err); #line 1897 "AppDirs.c" } - __finally452: + __finally460: #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -1980,12 +1980,12 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1983 "AppDirs.c" - goto __catch453_g_error; + goto __catch461_g_error; } } } - goto __finally453; - __catch453_g_error: + goto __finally461; + __catch461_g_error: { GError* err = NULL; GFile* _tmp13_; @@ -2023,7 +2023,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) { _g_error_free0 (err); #line 2025 "AppDirs.c" } - __finally453: + __finally461: #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala" @@ -2052,53 +2052,98 @@ GFile* app_dirs_get_lib_dir (void) { GFile* result = NULL; GFile* install_dir = NULL; GFile* _tmp0_; - GFile* _tmp1_ = NULL; - GFile* _tmp2_; + GFile* _tmp1_; + 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" install_dir = _tmp0_; -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp2_ = install_dir; -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - if (_tmp2_ != NULL) { -#line 2066 "AppDirs.c" - GFile* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp3_ = install_dir; -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp4_ = g_file_get_child (_tmp3_, RESOURCES_LIB); -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp5_ = _tmp4_; -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp6_ = g_file_get_child (_tmp5_, "shotwell"); -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp1_); -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = _tmp6_; -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp5_); -#line 2085 "AppDirs.c" - } else { - GFile* _tmp7_; #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp7_ = app_dirs_get_exec_dir (); + _tmp1_ = install_dir; #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala" - _g_object_unref0 (_tmp1_); -#line 265 "/home/jens/Source/shotwell/src/AppDirs.vala" - _tmp1_ = _tmp7_; -#line 2094 "AppDirs.c" + if (_tmp1_ == NULL) { +#line 2070 "AppDirs.c" + GFile* _tmp2_; + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; + GFile* _tmp12_; +#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp2_ = app_dirs_get_exec_dir (); +#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp3_ = _tmp2_; +#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp4_ = g_file_get_path (_tmp3_); +#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp5_ = _tmp4_; +#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" + GFile* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; +#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp8_ = app_dirs_get_exec_dir (); +#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp9_ = _tmp8_; +#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp10_ = g_file_get_parent (_tmp9_); +#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp11_ = _tmp10_; +#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" + _g_object_unref0 (_tmp9_); +#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala" + result = _tmp11_; +#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 271 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp12_ = app_dirs_get_exec_dir (); +#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala" + result = _tmp12_; +#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 264 "/home/jens/Source/shotwell/src/AppDirs.vala" - result = _tmp1_; -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp13_ = install_dir; +#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp14_ = g_file_get_child (_tmp13_, RESOURCES_LIB); +#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp15_ = _tmp14_; +#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp16_ = g_file_get_child (_tmp15_, "shotwell"); +#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" + _tmp17_ = _tmp16_; +#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" + _g_object_unref0 (_tmp15_); +#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" + result = _tmp17_; +#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (install_dir); -#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2102 "AppDirs.c" +#line 2147 "AppDirs.c" } @@ -2108,21 +2153,21 @@ GFile* app_dirs_get_system_plugins_dir (void) { GFile* _tmp1_; GFile* _tmp2_; GFile* _tmp3_; -#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_lib_dir (); -#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; -#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_file_get_child (_tmp1_, "plugins"); -#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp3_ = _tmp2_; -#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); -#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp3_; -#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2126 "AppDirs.c" +#line 2171 "AppDirs.c" } @@ -2132,54 +2177,54 @@ GFile* app_dirs_get_user_plugins_dir (void) { GFile* _tmp1_; GFile* _tmp2_; GFile* _tmp3_; -#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_data_dir (); -#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; -#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_file_get_child (_tmp1_, "plugins"); -#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp3_ = _tmp2_; -#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); -#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp3_; -#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2150 "AppDirs.c" +#line 2195 "AppDirs.c" } GFile* app_dirs_get_log_file (void) { GFile* result = NULL; const gchar* _tmp0_; -#line 277 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 286 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = g_getenv ("SHOTWELL_LOG_FILE"); -#line 277 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 286 "/home/jens/Source/shotwell/src/AppDirs.vala" if (_tmp0_ != NULL) { -#line 2161 "AppDirs.c" +#line 2206 "AppDirs.c" const gchar* _tmp1_; -#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 287 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = g_getenv ("SHOTWELL_LOG_FILE"); -#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 287 "/home/jens/Source/shotwell/src/AppDirs.vala" if (g_strcmp0 (_tmp1_, ":console:") == 0) { -#line 279 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala" result = NULL; -#line 279 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2171 "AppDirs.c" +#line 2216 "AppDirs.c" } else { const gchar* _tmp2_; GFile* _tmp3_; -#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_getenv ("SHOTWELL_LOG_FILE"); -#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp3_ = g_file_new_for_path (_tmp2_); -#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp3_; -#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2183 "AppDirs.c" +#line 2228 "AppDirs.c" } } else { const gchar* _tmp4_; @@ -2189,38 +2234,38 @@ GFile* app_dirs_get_log_file (void) { GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = g_get_user_cache_dir (); -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp5_ = g_file_new_for_path (_tmp4_); -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = _tmp5_; -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp7_ = g_file_get_child (_tmp6_, "shotwell"); -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp8_ = _tmp7_; -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp9_ = g_file_get_child (_tmp8_, "shotwell.log"); -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp10_ = _tmp9_; -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp8_); -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp6_); -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" result = _tmp10_; -#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2215 "AppDirs.c" +#line 2260 "AppDirs.c" } } GFile* app_dirs_get_thumbnailer_bin (void) { GFile* result = NULL; -#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 299 "/home/jens/Source/shotwell/src/AppDirs.vala" static const char filename[] = "shotwell-video-thumbnailer"; -#line 2224 "AppDirs.c" +#line 2269 "AppDirs.c" GFile* f = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2230,69 +2275,69 @@ GFile* app_dirs_get_thumbnailer_bin (void) { GFile* _tmp5_; GFile* _tmp6_; gboolean _tmp7_; -#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_libexec_dir (); -#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; -#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_file_get_child (_tmp1_, "thumbnailer"); -#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp3_ = _tmp2_; -#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = g_file_get_child (_tmp3_, filename); -#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp5_ = _tmp4_; -#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp3_); -#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); -#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" f = _tmp5_; -#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = f; -#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp7_ = g_file_query_exists (_tmp6_, NULL); -#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp7_) { -#line 2258 "AppDirs.c" +#line 2303 "AppDirs.c" GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; GFile* _tmp11_; GFile* _tmp12_; -#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp8_ = app_dirs_get_libexec_dir (); -#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp9_ = _tmp8_; -#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp10_ = g_file_get_child (_tmp9_, "shotwell"); -#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp11_ = _tmp10_; -#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp12_ = g_file_get_child (_tmp11_, filename); -#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (f); -#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" f = _tmp12_; -#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp11_); -#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp9_); -#line 2282 "AppDirs.c" +#line 2327 "AppDirs.c" } -#line 296 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 305 "/home/jens/Source/shotwell/src/AppDirs.vala" result = f; -#line 296 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 305 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2288 "AppDirs.c" +#line 2333 "AppDirs.c" } GFile* app_dirs_get_settings_migrator_bin (void) { GFile* result = NULL; -#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 309 "/home/jens/Source/shotwell/src/AppDirs.vala" static const char filename[] = "shotwell-settings-migrator"; -#line 2296 "AppDirs.c" +#line 2341 "AppDirs.c" GFile* f = NULL; GFile* _tmp0_; GFile* _tmp1_; @@ -2302,61 +2347,61 @@ GFile* app_dirs_get_settings_migrator_bin (void) { GFile* _tmp5_; GFile* _tmp6_; gboolean _tmp7_; -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp0_ = app_dirs_get_libexec_dir (); -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp1_ = _tmp0_; -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp2_ = g_file_get_child (_tmp1_, "settings-migrator"); -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp3_ = _tmp2_; -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp4_ = g_file_get_child (_tmp3_, filename); -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp5_ = _tmp4_; -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp3_); -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp1_); -#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala" f = _tmp5_; -#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp6_ = f; -#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp7_ = g_file_query_exists (_tmp6_, NULL); -#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala" if (!_tmp7_) { -#line 2330 "AppDirs.c" +#line 2375 "AppDirs.c" GFile* _tmp8_; GFile* _tmp9_; GFile* _tmp10_; GFile* _tmp11_; GFile* _tmp12_; -#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp8_ = app_dirs_get_libexec_dir (); -#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp9_ = _tmp8_; -#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp10_ = g_file_get_child (_tmp9_, "shotwell"); -#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp11_ = _tmp10_; -#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _tmp12_ = g_file_get_child (_tmp11_, filename); -#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (f); -#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" f = _tmp12_; -#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp11_); -#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala" _g_object_unref0 (_tmp9_); -#line 2354 "AppDirs.c" +#line 2399 "AppDirs.c" } -#line 306 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 315 "/home/jens/Source/shotwell/src/AppDirs.vala" result = f; -#line 306 "/home/jens/Source/shotwell/src/AppDirs.vala" +#line 315 "/home/jens/Source/shotwell/src/AppDirs.vala" return result; -#line 2360 "AppDirs.c" +#line 2405 "AppDirs.c" } @@ -2366,21 +2411,21 @@ AppDirs* app_dirs_construct (GType object_type) { self = (AppDirs*) g_type_create_instance (object_type); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return self; -#line 2370 "AppDirs.c" +#line 2415 "AppDirs.c" } AppDirs* app_dirs_new (void) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return app_dirs_construct (TYPE_APP_DIRS); -#line 2377 "AppDirs.c" +#line 2422 "AppDirs.c" } static void value_app_dirs_init (GValue* value) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2384 "AppDirs.c" +#line 2429 "AppDirs.c" } @@ -2389,7 +2434,7 @@ static void value_app_dirs_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" app_dirs_unref (value->data[0].v_pointer); -#line 2393 "AppDirs.c" +#line 2438 "AppDirs.c" } } @@ -2399,11 +2444,11 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" dest_value->data[0].v_pointer = app_dirs_ref (src_value->data[0].v_pointer); -#line 2403 "AppDirs.c" +#line 2448 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" dest_value->data[0].v_pointer = NULL; -#line 2407 "AppDirs.c" +#line 2452 "AppDirs.c" } } @@ -2411,37 +2456,37 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val static gpointer value_app_dirs_peek_pointer (const GValue* value) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return value->data[0].v_pointer; -#line 2415 "AppDirs.c" +#line 2460 "AppDirs.c" } static gchar* value_app_dirs_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" if (collect_values[0].v_pointer) { -#line 2422 "AppDirs.c" +#line 2467 "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 2429 "AppDirs.c" +#line 2474 "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 2433 "AppDirs.c" +#line 2478 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = app_dirs_ref (object); -#line 2437 "AppDirs.c" +#line 2482 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2441 "AppDirs.c" +#line 2486 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2445 "AppDirs.c" +#line 2490 "AppDirs.c" } @@ -2452,25 +2497,25 @@ static gchar* value_app_dirs_lcopy_value (const GValue* value, guint n_collect_v 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 2456 "AppDirs.c" +#line 2501 "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 2462 "AppDirs.c" +#line 2507 "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 2466 "AppDirs.c" +#line 2511 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" *object_p = app_dirs_ref (value->data[0].v_pointer); -#line 2470 "AppDirs.c" +#line 2515 "AppDirs.c" } #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return NULL; -#line 2474 "AppDirs.c" +#line 2519 "AppDirs.c" } @@ -2484,7 +2529,7 @@ GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return G_PARAM_SPEC (spec); -#line 2488 "AppDirs.c" +#line 2533 "AppDirs.c" } @@ -2493,7 +2538,7 @@ gpointer value_get_app_dirs (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS), NULL); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return value->data[0].v_pointer; -#line 2497 "AppDirs.c" +#line 2542 "AppDirs.c" } @@ -2513,17 +2558,17 @@ 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 2517 "AppDirs.c" +#line 2562 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2521 "AppDirs.c" +#line 2566 "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 2527 "AppDirs.c" +#line 2572 "AppDirs.c" } } @@ -2542,17 +2587,17 @@ void value_take_app_dirs (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = v_object; -#line 2546 "AppDirs.c" +#line 2591 "AppDirs.c" } else { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" value->data[0].v_pointer = NULL; -#line 2550 "AppDirs.c" +#line 2595 "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 2556 "AppDirs.c" +#line 2601 "AppDirs.c" } } @@ -2562,14 +2607,14 @@ static void app_dirs_class_init (AppDirsClass * klass) { app_dirs_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" ((AppDirsClass *) klass)->finalize = app_dirs_finalize; -#line 2566 "AppDirs.c" +#line 2611 "AppDirs.c" } static void app_dirs_instance_init (AppDirs * self) { #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" self->ref_count = 1; -#line 2573 "AppDirs.c" +#line 2618 "AppDirs.c" } @@ -2579,7 +2624,7 @@ static void app_dirs_finalize (AppDirs * obj) { 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 2583 "AppDirs.c" +#line 2628 "AppDirs.c" } @@ -2604,7 +2649,7 @@ gpointer app_dirs_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala" return instance; -#line 2608 "AppDirs.c" +#line 2653 "AppDirs.c" } @@ -2617,7 +2662,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 2621 "AppDirs.c" +#line 2666 "AppDirs.c" } } -- cgit v1.2.3