From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/data_imports/DataImportSource.c | 282 ++++++++++++++++++------------------ 1 file changed, 141 insertions(+), 141 deletions(-) (limited to 'src/data_imports/DataImportSource.c') diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c index 97e9bbd..715b62a 100644 --- a/src/data_imports/DataImportSource.c +++ b/src/data_imports/DataImportSource.c @@ -1,4 +1,4 @@ -/* DataImportSource.c generated by valac 0.34.7, the Vala compiler +/* DataImportSource.c generated by valac 0.36.6, the Vala compiler * generated from DataImportSource.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -178,7 +178,7 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self); gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format); gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self); -static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource* obj); +static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj); static gpointer _g_object_ref0 (gpointer self) { @@ -204,19 +204,19 @@ static gpointer _photo_preview_ref0 (gpointer self) { SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, SpitDataImportsImportableMediaItem* db_photo) { SpitDataImportsDataImportSource* self = NULL; - SpitDataImportsImportableMediaItem* _tmp0_ = NULL; - SpitDataImportsImportableMediaItem* _tmp1_ = NULL; + SpitDataImportsImportableMediaItem* _tmp0_; + SpitDataImportsImportableMediaItem* _tmp1_; gchar* folder_path = NULL; - SpitDataImportsImportableMediaItem* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + SpitDataImportsImportableMediaItem* _tmp2_; + gchar* _tmp3_; gchar* filename = NULL; - SpitDataImportsImportableMediaItem* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + SpitDataImportsImportableMediaItem* _tmp4_; + gchar* _tmp5_; GFile* photo = NULL; gboolean _tmp6_ = FALSE; - const gchar* _tmp7_ = NULL; + const gchar* _tmp7_; gboolean _tmp20_ = FALSE; - GFile* _tmp21_ = NULL; + GFile* _tmp21_; GError * _inner_error_ = NULL; #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (db_photo), NULL); @@ -249,7 +249,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp7_ != NULL) { #line 252 "DataImportSource.c" - const gchar* _tmp8_ = NULL; + const gchar* _tmp8_; #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp8_ = filename; #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -263,17 +263,17 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp6_) { #line 266 "DataImportSource.c" - SpitDataImportsImportableMediaItem* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - SpitDataImportsImportableMediaItem* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + SpitDataImportsImportableMediaItem* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + SpitDataImportsImportableMediaItem* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; + gboolean _tmp19_; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp9_ = db_photo; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -319,7 +319,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp21_ != NULL) { #line 322 "DataImportSource.c" - gboolean _tmp22_ = FALSE; + gboolean _tmp22_; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp22_ = self->priv->backing_file_found; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -334,27 +334,27 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct if (_tmp20_) { #line 336 "DataImportSource.c" PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp23_ = NULL; - SpitDataImportsImportableMediaItem* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; + PhotoMetadata* _tmp23_; + SpitDataImportsImportableMediaItem* _tmp30_; + gchar* _tmp31_; + const gchar* _tmp32_; time_t* date_time = NULL; - SpitDataImportsImportableMediaItem* _tmp38_ = NULL; - time_t* _tmp39_ = NULL; - time_t* _tmp40_ = NULL; + SpitDataImportsImportableMediaItem* _tmp38_; + time_t* _tmp39_; + time_t* _tmp40_; PhotoPreview* _tmp48_ = NULL; - PhotoMetadata* _tmp49_ = NULL; + PhotoMetadata* _tmp49_; PhotoPreview* preview = NULL; - PhotoPreview* _tmp52_ = NULL; - PhotoPreview* _tmp53_ = NULL; + PhotoPreview* _tmp52_; + PhotoPreview* _tmp53_; #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp23_ = photo_metadata_new (); #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" metadata = _tmp23_; #line 355 "DataImportSource.c" { - PhotoMetadata* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; + PhotoMetadata* _tmp24_; + GFile* _tmp25_; #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp24_ = metadata; #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -364,17 +364,17 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 367 "DataImportSource.c" - goto __catch217_g_error; + goto __catch218_g_error; } } - goto __finally217; - __catch217_g_error: + goto __finally218; + __catch218_g_error: { GError* e = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - GError* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; + gchar* _tmp26_; + gchar* _tmp27_; + GError* _tmp28_; + const gchar* _tmp29_; #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" e = _inner_error_; #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -399,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_error_free0 (e); #line 401 "DataImportSource.c" } - __finally217: + __finally218: #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -432,15 +432,15 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct if (_tmp32_ == NULL) { #line 434 "DataImportSource.c" gchar* _tmp33_ = NULL; - PhotoMetadata* _tmp34_ = NULL; - gchar* _tmp37_ = NULL; + PhotoMetadata* _tmp34_; + gchar* _tmp37_; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp34_ = metadata; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp34_ != NULL) { #line 442 "DataImportSource.c" - PhotoMetadata* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; + PhotoMetadata* _tmp35_; + gchar* _tmp36_; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp35_ = metadata; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -478,8 +478,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp40_ != NULL) { #line 481 "DataImportSource.c" - time_t* _tmp41_ = NULL; - MetadataDateTime* _tmp42_ = NULL; + time_t* _tmp41_; + MetadataDateTime* _tmp42_; #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp41_ = date_time; #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -491,15 +491,15 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 492 "DataImportSource.c" } else { MetadataDateTime* _tmp43_ = NULL; - PhotoMetadata* _tmp44_ = NULL; - MetadataDateTime* _tmp47_ = NULL; + PhotoMetadata* _tmp44_; + MetadataDateTime* _tmp47_; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp44_ = metadata; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp44_ != NULL) { #line 501 "DataImportSource.c" - PhotoMetadata* _tmp45_ = NULL; - MetadataDateTime* _tmp46_ = NULL; + PhotoMetadata* _tmp45_; + MetadataDateTime* _tmp46_; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp45_ = metadata; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -531,8 +531,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp49_ != NULL) { #line 534 "DataImportSource.c" - PhotoMetadata* _tmp50_ = NULL; - PhotoPreview* _tmp51_ = NULL; + PhotoMetadata* _tmp50_; + PhotoPreview* _tmp51_; #line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp50_ = metadata; #line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -560,16 +560,16 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 561 "DataImportSource.c" { guint8* preview_raw = NULL; - PhotoPreview* _tmp54_ = NULL; - gint _tmp55_ = 0; - guint8* _tmp56_ = NULL; - gint preview_raw_length1 = 0; - gint _preview_raw_size_ = 0; - guint8* _tmp57_ = NULL; - gint _tmp57__length1 = 0; - guint8* _tmp58_ = NULL; - gint _tmp58__length1 = 0; - gchar* _tmp59_ = NULL; + PhotoPreview* _tmp54_; + gint _tmp55_; + guint8* _tmp56_; + gint preview_raw_length1; + gint _preview_raw_size_; + guint8* _tmp57_; + gint _tmp57__length1; + guint8* _tmp58_; + gint _tmp58__length1; + gchar* _tmp59_; #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp54_ = preview; #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -583,7 +583,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 586 "DataImportSource.c" - goto __catch218_g_error; + goto __catch219_g_error; } #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp57_ = preview_raw; @@ -603,14 +603,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct preview_raw = (g_free (preview_raw), NULL); #line 605 "DataImportSource.c" } - goto __finally218; - __catch218_g_error: + goto __finally219; + __catch219_g_error: { GError* e = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - GError* _tmp62_ = NULL; - const gchar* _tmp63_ = NULL; + gchar* _tmp60_; + gchar* _tmp61_; + GError* _tmp62_; + const gchar* _tmp63_; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" e = _inner_error_; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -631,7 +631,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_error_free0 (e); #line 633 "DataImportSource.c" } - __finally218: + __finally219: #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -659,8 +659,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct } { guint64 _tmp64_ = 0ULL; - GFile* _tmp65_ = NULL; - guint64 _tmp66_ = 0ULL; + GFile* _tmp65_; + guint64 _tmp66_; #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp65_ = photo; #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -670,20 +670,20 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 673 "DataImportSource.c" - goto __catch219_g_error; + goto __catch220_g_error; } #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->priv->file_size = _tmp64_; #line 678 "DataImportSource.c" } - goto __finally219; - __catch219_g_error: + goto __finally220; + __catch220_g_error: { GError* e = NULL; - gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - GError* _tmp69_ = NULL; - const gchar* _tmp70_ = NULL; + gchar* _tmp67_; + gchar* _tmp68_; + GError* _tmp69_; + const gchar* _tmp70_; #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" e = _inner_error_; #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -704,7 +704,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_error_free0 (e); #line 706 "DataImportSource.c" } - __finally219: + __finally220: #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -731,8 +731,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct } { time_t _tmp71_ = 0; - GFile* _tmp72_ = NULL; - time_t _tmp73_ = 0; + GFile* _tmp72_; + time_t _tmp73_; #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp72_ = photo; #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -742,20 +742,20 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 745 "DataImportSource.c" - goto __catch220_g_error; + goto __catch221_g_error; } #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->priv->modification_time = _tmp71_; #line 750 "DataImportSource.c" } - goto __finally220; - __catch220_g_error: + goto __finally221; + __catch221_g_error: { GError* e = NULL; - gchar* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - GError* _tmp76_ = NULL; - const gchar* _tmp77_ = NULL; + gchar* _tmp74_; + gchar* _tmp75_; + GError* _tmp76_; + const gchar* _tmp77_; #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" e = _inner_error_; #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -776,7 +776,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_error_free0 (e); #line 778 "DataImportSource.c" } - __finally220: + __finally221: #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -811,11 +811,11 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _media_metadata_unref0 (metadata); #line 813 "DataImportSource.c" } else { - GFile* _tmp78_ = NULL; - gchar* _tmp79_ = NULL; - gchar* _tmp80_ = NULL; - gchar* _tmp81_ = NULL; - gchar* _tmp82_ = NULL; + GFile* _tmp78_; + gchar* _tmp79_; + gchar* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp78_ = photo; #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -855,8 +855,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitD gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self) { gchar* result = NULL; - SpitDataImportsImportableMediaItem* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitDataImportsImportableMediaItem* _tmp0_; + gchar* _tmp1_; #line 89 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL); #line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -873,8 +873,8 @@ gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImp gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self) { gchar* result = NULL; - SpitDataImportsImportableMediaItem* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitDataImportsImportableMediaItem* _tmp0_; + gchar* _tmp1_; #line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL); #line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -891,14 +891,14 @@ gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImpo GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self) { GFile* result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL); #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -934,8 +934,8 @@ GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportS gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportSource* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + const gchar* _tmp1_; + gboolean _tmp2_; #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL); #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -945,8 +945,8 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (!_tmp2_) { #line 948 "DataImportSource.c" - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + const gchar* _tmp3_; + gchar* _tmp4_; #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp3_ = self->priv->title; #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -957,7 +957,7 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS _tmp0_ = _tmp4_; #line 959 "DataImportSource.c" } else { - gchar* _tmp5_ = NULL; + gchar* _tmp5_; #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp5_ = spit_data_imports_data_import_source_get_filename (self); #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -976,8 +976,8 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImportSource* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL); #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -994,10 +994,10 @@ gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImport PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataImportsDataImportSource* self) { PhotoFileFormat result = 0; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - PhotoFileFormat _tmp2_ = 0; - PhotoFileFormat _tmp3_ = 0; + gchar* _tmp0_; + gchar* _tmp1_; + PhotoFileFormat _tmp2_; + PhotoFileFormat _tmp3_; #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0); #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1020,7 +1020,7 @@ PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataIm gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL); #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1036,7 +1036,7 @@ gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImport time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self) { time_t result = 0; time_t _tmp0_ = 0; - MetadataDateTime* _tmp1_ = NULL; + MetadataDateTime* _tmp1_; #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0); #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1044,8 +1044,8 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp1_ != NULL) { #line 1047 "DataImportSource.c" - MetadataDateTime* _tmp2_ = NULL; - time_t _tmp3_ = 0; + MetadataDateTime* _tmp2_; + time_t _tmp3_; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp2_ = self->priv->exposure_time; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1054,7 +1054,7 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa _tmp0_ = _tmp3_; #line 1056 "DataImportSource.c" } else { - time_t _tmp4_ = 0; + time_t _tmp4_; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp4_ = self->priv->modification_time; #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1071,7 +1071,7 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self) { guint64 result = 0ULL; - guint64 _tmp0_ = 0ULL; + guint64 _tmp0_; #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0ULL); #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1086,8 +1086,8 @@ guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataIm SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self) { SpitDataImportsImportableMediaItem* result = NULL; - SpitDataImportsImportableMediaItem* _tmp0_ = NULL; - SpitDataImportsImportableMediaItem* _tmp1_ = NULL; + SpitDataImportsImportableMediaItem* _tmp0_; + SpitDataImportsImportableMediaItem* _tmp1_; #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL); #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1105,7 +1105,7 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), FALSE); #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1113,9 +1113,9 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp1_ != NULL) { #line 1116 "DataImportSource.c" - const gchar* _tmp2_ = NULL; - PhotoFileFormat _tmp3_ = 0; - gboolean _tmp4_ = FALSE; + const gchar* _tmp2_; + PhotoFileFormat _tmp3_; + gboolean _tmp4_; #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp2_ = self->priv->preview_md5; #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1140,7 +1140,7 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), FALSE); #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1195,7 +1195,7 @@ static gchar* spit_data_imports_value_data_import_source_collect_value (GValue* #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (collect_values[0].v_pointer) { #line 1198 "DataImportSource.c" - SpitDataImportsDataImportSource* object; + SpitDataImportsDataImportSource * object; object = collect_values[0].v_pointer; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (object->parent_instance.g_class == NULL) { @@ -1222,7 +1222,7 @@ static gchar* spit_data_imports_value_data_import_source_collect_value (GValue* static gchar* spit_data_imports_value_data_import_source_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SpitDataImportsDataImportSource** object_p; + SpitDataImportsDataImportSource ** object_p; object_p = collect_values[0].v_pointer; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (!object_p) { @@ -1274,7 +1274,7 @@ gpointer spit_data_imports_value_get_data_import_source (const GValue* value) { void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object) { - SpitDataImportsDataImportSource* old; + SpitDataImportsDataImportSource * old; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE)); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1305,7 +1305,7 @@ void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_o void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object) { - SpitDataImportsDataImportSource* old; + SpitDataImportsDataImportSource * old; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE)); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -1357,7 +1357,7 @@ static void spit_data_imports_data_import_source_instance_init (SpitDataImportsD } -static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource* obj) { +static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj) { SpitDataImportsDataImportSource * self; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, SpitDataImportsDataImportSource); @@ -1398,7 +1398,7 @@ GType spit_data_imports_data_import_source_get_type (void) { gpointer spit_data_imports_data_import_source_ref (gpointer instance) { - SpitDataImportsDataImportSource* self; + SpitDataImportsDataImportSource * self; self = instance; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_atomic_int_inc (&self->ref_count); @@ -1409,7 +1409,7 @@ gpointer spit_data_imports_data_import_source_ref (gpointer instance) { void spit_data_imports_data_import_source_unref (gpointer instance) { - SpitDataImportsDataImportSource* self; + SpitDataImportsDataImportSource * self; self = instance; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -- cgit v1.2.3