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/data_imports/DataImportSource.c | 759 ++++++++++++++---------------------- 1 file changed, 301 insertions(+), 458 deletions(-) (limited to 'src/data_imports/DataImportSource.c') diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c index 715b62a..d3990dc 100644 --- a/src/data_imports/DataImportSource.c +++ b/src/data_imports/DataImportSource.c @@ -63,17 +63,6 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass; #define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) -#define TYPE_PHOTO_PREVIEW (photo_preview_get_type ()) -#define PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_PREVIEW, PhotoPreview)) -#define PHOTO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_PREVIEW, PhotoPreviewClass)) -#define IS_PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_PREVIEW)) -#define IS_PHOTO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_PREVIEW)) -#define PHOTO_PREVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_PREVIEW, PhotoPreviewClass)) - -typedef struct _PhotoPreview PhotoPreview; -typedef struct _PhotoPreviewClass PhotoPreviewClass; -#define _photo_preview_unref0(var) ((var == NULL) ? NULL : (var = (photo_preview_unref (var), NULL))) - #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ()) typedef struct _SpitDataImportsParamSpecDataImportSource SpitDataImportsParamSpecDataImportSource; @@ -150,16 +139,7 @@ gchar* media_metadata_get_title (MediaMetadata* self); MetadataDateTime* metadata_date_time_new (time_t timestamp); MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp); MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self); -gpointer photo_preview_ref (gpointer instance); -void photo_preview_unref (gpointer instance); -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_preview (GValue* value, gpointer v_object); -void value_take_photo_preview (GValue* value, gpointer v_object); -gpointer value_get_photo_preview (const GValue* value); -GType photo_preview_get_type (void) G_GNUC_CONST; -PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number); -guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error); -gchar* md5_binary (guint8* buffer, gsize length); +gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error); time_t query_file_modified (GFile* file, GError** error); gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self); @@ -184,21 +164,14 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm static gpointer _g_object_ref0 (gpointer self) { #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return self ? g_object_ref (self) : NULL; -#line 188 "DataImportSource.c" +#line 168 "DataImportSource.c" } static gpointer _metadata_date_time_ref0 (gpointer self) { #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return self ? metadata_date_time_ref (self) : NULL; -#line 195 "DataImportSource.c" -} - - -static gpointer _photo_preview_ref0 (gpointer self) { -#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - return self ? photo_preview_ref (self) : NULL; -#line 202 "DataImportSource.c" +#line 175 "DataImportSource.c" } @@ -248,21 +221,21 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _tmp7_ = folder_path; #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp7_ != NULL) { -#line 252 "DataImportSource.c" +#line 225 "DataImportSource.c" 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" _tmp6_ = _tmp8_ != NULL; -#line 258 "DataImportSource.c" +#line 231 "DataImportSource.c" } else { #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp6_ = FALSE; -#line 262 "DataImportSource.c" +#line 235 "DataImportSource.c" } #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp6_) { -#line 266 "DataImportSource.c" +#line 239 "DataImportSource.c" SpitDataImportsImportableMediaItem* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; @@ -308,31 +281,31 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _tmp19_ = g_file_query_exists (_tmp18_, NULL); #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->priv->backing_file_found = _tmp19_; -#line 312 "DataImportSource.c" +#line 285 "DataImportSource.c" } else { #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->priv->backing_file_found = FALSE; -#line 316 "DataImportSource.c" +#line 289 "DataImportSource.c" } #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp21_ = photo; #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp21_ != NULL) { -#line 322 "DataImportSource.c" +#line 295 "DataImportSource.c" 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" _tmp20_ = _tmp22_; -#line 328 "DataImportSource.c" +#line 301 "DataImportSource.c" } else { #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp20_ = FALSE; -#line 332 "DataImportSource.c" +#line 305 "DataImportSource.c" } #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp20_) { -#line 336 "DataImportSource.c" +#line 309 "DataImportSource.c" PhotoMetadata* metadata = NULL; PhotoMetadata* _tmp23_; SpitDataImportsImportableMediaItem* _tmp30_; @@ -342,16 +315,12 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct SpitDataImportsImportableMediaItem* _tmp38_; time_t* _tmp39_; time_t* _tmp40_; - PhotoPreview* _tmp48_ = NULL; - PhotoMetadata* _tmp49_; - PhotoPreview* preview = NULL; - PhotoPreview* _tmp52_; - PhotoPreview* _tmp53_; + PhotoMetadata* _tmp48_; #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" +#line 324 "DataImportSource.c" { PhotoMetadata* _tmp24_; GFile* _tmp25_; @@ -363,12 +332,12 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp25_, &_inner_error_); #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 367 "DataImportSource.c" - goto __catch218_g_error; +#line 336 "DataImportSource.c" + goto __catch230_g_error; } } - goto __finally218; - __catch218_g_error: + goto __finally230; + __catch230_g_error: { GError* e = NULL; gchar* _tmp26_; @@ -397,9 +366,9 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct metadata = NULL; #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_error_free0 (e); -#line 401 "DataImportSource.c" +#line 370 "DataImportSource.c" } - __finally218: + __finally230: #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" @@ -416,7 +385,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct g_clear_error (&_inner_error_); #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 420 "DataImportSource.c" +#line 389 "DataImportSource.c" } #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp30_ = db_photo; @@ -430,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _tmp32_ = self->priv->title; #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp32_ == NULL) { -#line 434 "DataImportSource.c" +#line 403 "DataImportSource.c" gchar* _tmp33_ = NULL; PhotoMetadata* _tmp34_; gchar* _tmp37_; @@ -438,7 +407,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _tmp34_ = metadata; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp34_ != NULL) { -#line 442 "DataImportSource.c" +#line 411 "DataImportSource.c" PhotoMetadata* _tmp35_; gchar* _tmp36_; #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -449,13 +418,13 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_free0 (_tmp33_); #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp33_ = _tmp36_; -#line 453 "DataImportSource.c" +#line 422 "DataImportSource.c" } else { #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp33_); #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp33_ = NULL; -#line 459 "DataImportSource.c" +#line 428 "DataImportSource.c" } #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp37_ = g_strdup (_tmp33_); @@ -465,7 +434,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct self->priv->title = _tmp37_; #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp33_); -#line 469 "DataImportSource.c" +#line 438 "DataImportSource.c" } #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp38_ = db_photo; @@ -477,7 +446,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _tmp40_ = date_time; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp40_ != NULL) { -#line 481 "DataImportSource.c" +#line 450 "DataImportSource.c" time_t* _tmp41_; MetadataDateTime* _tmp42_; #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -488,7 +457,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _metadata_date_time_unref0 (self->priv->exposure_time); #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->priv->exposure_time = _tmp42_; -#line 492 "DataImportSource.c" +#line 461 "DataImportSource.c" } else { MetadataDateTime* _tmp43_ = NULL; PhotoMetadata* _tmp44_; @@ -497,7 +466,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _tmp44_ = metadata; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp44_ != NULL) { -#line 501 "DataImportSource.c" +#line 470 "DataImportSource.c" PhotoMetadata* _tmp45_; MetadataDateTime* _tmp46_; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -508,13 +477,13 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _metadata_date_time_unref0 (_tmp43_); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp43_ = _tmp46_; -#line 512 "DataImportSource.c" +#line 481 "DataImportSource.c" } else { #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _metadata_date_time_unref0 (_tmp43_); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp43_ = NULL; -#line 518 "DataImportSource.c" +#line 487 "DataImportSource.c" } #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp47_ = _metadata_date_time_ref0 (_tmp43_); @@ -524,315 +493,189 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct self->priv->exposure_time = _tmp47_; #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _metadata_date_time_unref0 (_tmp43_); -#line 528 "DataImportSource.c" +#line 497 "DataImportSource.c" } -#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp49_ = metadata; -#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp49_ != NULL) { -#line 534 "DataImportSource.c" - 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" - _tmp51_ = photo_metadata_get_preview (_tmp50_, (guint) 0); -#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _photo_preview_unref0 (_tmp48_); -#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp48_ = _tmp51_; -#line 545 "DataImportSource.c" - } else { -#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _photo_preview_unref0 (_tmp48_); -#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp48_ = NULL; -#line 551 "DataImportSource.c" - } -#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp52_ = _photo_preview_ref0 (_tmp48_); -#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - preview = _tmp52_; #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp53_ = preview; + _tmp48_ = metadata; #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (_tmp53_ != NULL) { -#line 561 "DataImportSource.c" - { - guint8* preview_raw = 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" - _tmp56_ = photo_preview_flatten (_tmp54_, &_tmp55_, &_inner_error_); -#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - preview_raw = _tmp56_; -#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - preview_raw_length1 = _tmp55_; -#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _preview_raw_size_ = preview_raw_length1; -#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 586 "DataImportSource.c" - goto __catch219_g_error; - } -#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp57_ = preview_raw; -#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp57__length1 = preview_raw_length1; -#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp58_ = preview_raw; -#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp58__length1 = preview_raw_length1; -#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp59_ = md5_binary (_tmp57_, (gsize) _tmp58__length1); -#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (self->priv->preview_md5); -#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->preview_md5 = _tmp59_; -#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - preview_raw = (g_free (preview_raw), NULL); -#line 605 "DataImportSource.c" - } - goto __finally219; - __catch219_g_error: - { - GError* e = 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" - _inner_error_ = NULL; -#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp60_ = spit_data_imports_data_import_source_get_filename (self); -#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp61_ = _tmp60_; -#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp62_ = e; -#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp63_ = _tmp62_->message; -#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_warning ("DataImportSource.vala:67: Could not get raw preview for %s: %s", _tmp61_, _tmp63_); -#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp61_); -#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_error_free0 (e); -#line 633 "DataImportSource.c" - } - __finally219: -#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { + if (_tmp48_ != NULL) { +#line 503 "DataImportSource.c" + PhotoMetadata* _tmp49_; + gchar* _tmp50_; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _photo_preview_unref0 (preview); + _tmp49_ = metadata; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _photo_preview_unref0 (_tmp48_); + _tmp50_ = photo_metadata_thumbnail_hash (_tmp49_); #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (date_time); + _g_free0 (self->priv->preview_md5); #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _media_metadata_unref0 (metadata); -#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_object_unref0 (photo); -#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (filename); -#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (folder_path); -#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_clear_error (&_inner_error_); -#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - return NULL; -#line 658 "DataImportSource.c" - } + self->priv->preview_md5 = _tmp50_; +#line 514 "DataImportSource.c" } { - guint64 _tmp64_ = 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" - _tmp66_ = query_total_file_size (_tmp65_, NULL, &_inner_error_); -#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp64_ = _tmp66_; -#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + guint64 _tmp51_ = 0ULL; + GFile* _tmp52_; + guint64 _tmp53_; +#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp52_ = photo; +#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp53_ = query_total_file_size (_tmp52_, NULL, &_inner_error_); +#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp51_ = _tmp53_; +#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 673 "DataImportSource.c" - goto __catch220_g_error; +#line 528 "DataImportSource.c" + goto __catch231_g_error; } -#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->file_size = _tmp64_; -#line 678 "DataImportSource.c" +#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + self->priv->file_size = _tmp51_; +#line 533 "DataImportSource.c" } - goto __finally220; - __catch220_g_error: + goto __finally231; + __catch231_g_error: { GError* e = NULL; - gchar* _tmp67_; - gchar* _tmp68_; - GError* _tmp69_; - const gchar* _tmp70_; -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + gchar* _tmp54_; + gchar* _tmp55_; + GError* _tmp56_; + const gchar* _tmp57_; +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" e = _inner_error_; -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _inner_error_ = NULL; -#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp67_ = spit_data_imports_data_import_source_get_filename (self); -#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp68_ = _tmp67_; -#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp69_ = e; -#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp70_ = _tmp69_->message; -#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_warning ("DataImportSource.vala:77: Could not get file size for %s: %s", _tmp68_, _tmp70_); -#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp68_); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp54_ = spit_data_imports_data_import_source_get_filename (self); +#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp55_ = _tmp54_; +#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp56_ = e; +#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp57_ = _tmp56_->message; +#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + g_warning ("DataImportSource.vala:73: Could not get file size for %s: %s", _tmp55_, _tmp57_); +#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _g_free0 (_tmp55_); +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_error_free0 (e); -#line 706 "DataImportSource.c" +#line 561 "DataImportSource.c" } - __finally220: -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + __finally231: +#line 70 "/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" - _photo_preview_unref0 (preview); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _photo_preview_unref0 (_tmp48_); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (date_time); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _media_metadata_unref0 (metadata); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_object_unref0 (photo); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (filename); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (folder_path); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_clear_error (&_inner_error_); -#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 731 "DataImportSource.c" +#line 582 "DataImportSource.c" } { - time_t _tmp71_ = 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" - _tmp73_ = query_file_modified (_tmp72_, &_inner_error_); -#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp71_ = _tmp73_; -#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + time_t _tmp58_ = 0; + GFile* _tmp59_; + time_t _tmp60_; +#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp59_ = photo; +#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp60_ = query_file_modified (_tmp59_, &_inner_error_); +#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp58_ = _tmp60_; +#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 745 "DataImportSource.c" - goto __catch221_g_error; +#line 596 "DataImportSource.c" + goto __catch232_g_error; } -#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - self->priv->modification_time = _tmp71_; -#line 750 "DataImportSource.c" +#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + self->priv->modification_time = _tmp58_; +#line 601 "DataImportSource.c" } - goto __finally221; - __catch221_g_error: + goto __finally232; + __catch232_g_error: { GError* e = NULL; - gchar* _tmp74_; - gchar* _tmp75_; - GError* _tmp76_; - const gchar* _tmp77_; -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + gchar* _tmp61_; + gchar* _tmp62_; + GError* _tmp63_; + const gchar* _tmp64_; +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" e = _inner_error_; -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _inner_error_ = NULL; -#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp74_ = spit_data_imports_data_import_source_get_filename (self); -#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp75_ = _tmp74_; -#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp76_ = e; -#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp77_ = _tmp76_->message; -#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_warning ("DataImportSource.vala:82: Could not get modification time for %s: %s", _tmp75_, _tmp77_); -#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp75_); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp61_ = spit_data_imports_data_import_source_get_filename (self); +#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp62_ = _tmp61_; +#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp63_ = e; +#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp64_ = _tmp63_->message; +#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + g_warning ("DataImportSource.vala:78: Could not get modification time for %s: %s", _tmp62_, _tmp64_); +#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _g_free0 (_tmp62_); +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_error_free0 (e); -#line 778 "DataImportSource.c" +#line 629 "DataImportSource.c" } - __finally221: -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + __finally232: +#line 75 "/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" - _photo_preview_unref0 (preview); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _photo_preview_unref0 (_tmp48_); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (date_time); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _media_metadata_unref0 (metadata); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_object_unref0 (photo); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (filename); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (folder_path); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_clear_error (&_inner_error_); -#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 803 "DataImportSource.c" +#line 650 "DataImportSource.c" } -#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _photo_preview_unref0 (preview); -#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _photo_preview_unref0 (_tmp48_); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (date_time); #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _media_metadata_unref0 (metadata); -#line 813 "DataImportSource.c" +#line 656 "DataImportSource.c" } else { - 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" - _tmp79_ = g_file_get_path (_tmp78_); -#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp80_ = _tmp79_; -#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp81_ = g_strdup_printf ("Photo file %s not found", _tmp80_); -#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _tmp82_ = _tmp81_; -#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - g_debug ("DataImportSource.vala:85: %s", _tmp82_); -#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp82_); -#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" - _g_free0 (_tmp80_); -#line 836 "DataImportSource.c" + GFile* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; +#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp65_ = photo; +#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp66_ = g_file_get_path (_tmp65_); +#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp67_ = _tmp66_; +#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp68_ = g_strdup_printf ("Photo file %s not found", _tmp67_); +#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _tmp69_ = _tmp68_; +#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + g_debug ("DataImportSource.vala:81: %s", _tmp69_); +#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _g_free0 (_tmp69_); +#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" + _g_free0 (_tmp67_); +#line 679 "DataImportSource.c" } #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_object_unref0 (photo); @@ -842,14 +685,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_free0 (folder_path); #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return self; -#line 846 "DataImportSource.c" +#line 689 "DataImportSource.c" } SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo) { #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return spit_data_imports_data_import_source_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, db_photo); -#line 853 "DataImportSource.c" +#line 696 "DataImportSource.c" } @@ -857,17 +700,17 @@ gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImp gchar* result = NULL; SpitDataImportsImportableMediaItem* _tmp0_; gchar* _tmp1_; -#line 89 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 85 "/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" +#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = self->priv->db_photo; -#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = spit_data_imports_importable_media_item_get_filename (_tmp0_); -#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp1_; -#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 871 "DataImportSource.c" +#line 714 "DataImportSource.c" } @@ -875,17 +718,17 @@ gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImpo gchar* result = NULL; SpitDataImportsImportableMediaItem* _tmp0_; gchar* _tmp1_; -#line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#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 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = self->priv->db_photo; -#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = spit_data_imports_importable_media_item_get_folder_path (_tmp0_); -#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp1_; -#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 889 "DataImportSource.c" +#line 732 "DataImportSource.c" } @@ -899,35 +742,35 @@ GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportS gchar* _tmp5_; GFile* _tmp6_; GFile* _tmp7_; -#line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#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 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = spit_data_imports_data_import_source_get_fulldir (self); -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = _tmp0_; -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp2_ = g_file_new_for_path (_tmp1_); -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp3_ = _tmp2_; -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp4_ = spit_data_imports_data_import_source_get_filename (self); -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp5_ = _tmp4_; -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp6_ = g_file_get_child (_tmp3_, _tmp5_); -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp7_ = _tmp6_; -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp5_); -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_object_unref0 (_tmp3_); -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp1_); -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp7_; -#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 931 "DataImportSource.c" +#line 774 "DataImportSource.c" } @@ -936,41 +779,41 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS gchar* _tmp0_ = NULL; const gchar* _tmp1_; gboolean _tmp2_; -#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#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 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = self->priv->title; -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp2_ = is_string_empty (_tmp1_); -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (!_tmp2_) { -#line 948 "DataImportSource.c" +#line 791 "DataImportSource.c" const gchar* _tmp3_; gchar* _tmp4_; -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp3_ = self->priv->title; -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp4_ = g_strdup (_tmp3_); -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp0_); -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = _tmp4_; -#line 959 "DataImportSource.c" +#line 802 "DataImportSource.c" } else { gchar* _tmp5_; -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/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" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp0_); -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = _tmp5_; -#line 968 "DataImportSource.c" +#line 811 "DataImportSource.c" } -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp0_; -#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 974 "DataImportSource.c" +#line 817 "DataImportSource.c" } @@ -978,17 +821,17 @@ gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImport gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; -#line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#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 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = self->priv->title; -#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = g_strdup (_tmp0_); -#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp1_; -#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 992 "DataImportSource.c" +#line 835 "DataImportSource.c" } @@ -998,38 +841,38 @@ PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataIm gchar* _tmp1_; PhotoFileFormat _tmp2_; PhotoFileFormat _tmp3_; -#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 105 "/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" +#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = spit_data_imports_data_import_source_get_filename (self); -#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = _tmp0_; -#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp2_ = photo_file_format_get_by_basename_extension (_tmp1_); -#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp3_ = _tmp2_; -#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _g_free0 (_tmp1_); -#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp3_; -#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 1018 "DataImportSource.c" +#line 861 "DataImportSource.c" } gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self) { gchar* result = NULL; gchar* _tmp0_; -#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 109 "/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" +#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = spit_data_imports_data_import_source_get_name (self); -#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp0_; -#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 1033 "DataImportSource.c" +#line 876 "DataImportSource.c" } @@ -1037,50 +880,50 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa time_t result = 0; time_t _tmp0_ = 0; MetadataDateTime* _tmp1_; -#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 113 "/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" +#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = self->priv->exposure_time; -#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp1_ != NULL) { -#line 1047 "DataImportSource.c" +#line 890 "DataImportSource.c" MetadataDateTime* _tmp2_; time_t _tmp3_; -#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 114 "/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" +#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp3_ = metadata_date_time_get_timestamp (_tmp2_); -#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = _tmp3_; -#line 1056 "DataImportSource.c" +#line 899 "DataImportSource.c" } else { time_t _tmp4_; -#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 114 "/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" +#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = _tmp4_; -#line 1063 "DataImportSource.c" +#line 906 "DataImportSource.c" } -#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp0_; -#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 1069 "DataImportSource.c" +#line 912 "DataImportSource.c" } guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self) { guint64 result = 0ULL; guint64 _tmp0_; -#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 117 "/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" +#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = self->priv->file_size; -#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp0_; -#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 1084 "DataImportSource.c" +#line 927 "DataImportSource.c" } @@ -1088,17 +931,17 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho SpitDataImportsImportableMediaItem* result = NULL; SpitDataImportsImportableMediaItem* _tmp0_; SpitDataImportsImportableMediaItem* _tmp1_; -#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 121 "/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" +#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = self->priv->db_photo; -#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp1_; -#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 1102 "DataImportSource.c" +#line 945 "DataImportSource.c" } @@ -1106,57 +949,57 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor gboolean result = FALSE; gboolean _tmp0_ = FALSE; const gchar* _tmp1_; -#line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 125 "/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" +#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp1_ = self->priv->preview_md5; -#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (_tmp1_ != NULL) { -#line 1116 "DataImportSource.c" +#line 959 "DataImportSource.c" const gchar* _tmp2_; PhotoFileFormat _tmp3_; gboolean _tmp4_; -#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 128 "/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" +#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp3_ = spit_data_imports_data_import_source_get_file_format (self); -#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp4_ = library_photo_has_nontrash_duplicate (NULL, _tmp2_, NULL, _tmp3_); -#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = _tmp4_; -#line 1128 "DataImportSource.c" +#line 971 "DataImportSource.c" } else { -#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = FALSE; -#line 1132 "DataImportSource.c" +#line 975 "DataImportSource.c" } -#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp0_; -#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 1138 "DataImportSource.c" +#line 981 "DataImportSource.c" } gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 132 "/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" +#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp0_ = self->priv->backing_file_found; -#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" result = _tmp0_; -#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" +#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return result; -#line 1153 "DataImportSource.c" +#line 996 "DataImportSource.c" } static void spit_data_imports_value_data_import_source_init (GValue* value) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = NULL; -#line 1160 "DataImportSource.c" +#line 1003 "DataImportSource.c" } @@ -1165,7 +1008,7 @@ static void spit_data_imports_value_data_import_source_free_value (GValue* value if (value->data[0].v_pointer) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" spit_data_imports_data_import_source_unref (value->data[0].v_pointer); -#line 1169 "DataImportSource.c" +#line 1012 "DataImportSource.c" } } @@ -1175,11 +1018,11 @@ static void spit_data_imports_value_data_import_source_copy_value (const GValue* if (src_value->data[0].v_pointer) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" dest_value->data[0].v_pointer = spit_data_imports_data_import_source_ref (src_value->data[0].v_pointer); -#line 1179 "DataImportSource.c" +#line 1022 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" dest_value->data[0].v_pointer = NULL; -#line 1183 "DataImportSource.c" +#line 1026 "DataImportSource.c" } } @@ -1187,37 +1030,37 @@ static void spit_data_imports_value_data_import_source_copy_value (const GValue* static gpointer spit_data_imports_value_data_import_source_peek_pointer (const GValue* value) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return value->data[0].v_pointer; -#line 1191 "DataImportSource.c" +#line 1034 "DataImportSource.c" } static gchar* spit_data_imports_value_data_import_source_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (collect_values[0].v_pointer) { -#line 1198 "DataImportSource.c" +#line 1041 "DataImportSource.c" 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) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1205 "DataImportSource.c" +#line 1048 "DataImportSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.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 1209 "DataImportSource.c" +#line 1052 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = spit_data_imports_data_import_source_ref (object); -#line 1213 "DataImportSource.c" +#line 1056 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = NULL; -#line 1217 "DataImportSource.c" +#line 1060 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 1221 "DataImportSource.c" +#line 1064 "DataImportSource.c" } @@ -1228,25 +1071,25 @@ static gchar* spit_data_imports_value_data_import_source_lcopy_value (const GVal if (!object_p) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1232 "DataImportSource.c" +#line 1075 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (!value->data[0].v_pointer) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" *object_p = NULL; -#line 1238 "DataImportSource.c" +#line 1081 "DataImportSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" *object_p = value->data[0].v_pointer; -#line 1242 "DataImportSource.c" +#line 1085 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" *object_p = spit_data_imports_data_import_source_ref (value->data[0].v_pointer); -#line 1246 "DataImportSource.c" +#line 1089 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return NULL; -#line 1250 "DataImportSource.c" +#line 1093 "DataImportSource.c" } @@ -1260,7 +1103,7 @@ GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return G_PARAM_SPEC (spec); -#line 1264 "DataImportSource.c" +#line 1107 "DataImportSource.c" } @@ -1269,7 +1112,7 @@ gpointer spit_data_imports_value_get_data_import_source (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE), NULL); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return value->data[0].v_pointer; -#line 1273 "DataImportSource.c" +#line 1116 "DataImportSource.c" } @@ -1289,17 +1132,17 @@ void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_o value->data[0].v_pointer = v_object; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" spit_data_imports_data_import_source_ref (value->data[0].v_pointer); -#line 1293 "DataImportSource.c" +#line 1136 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = NULL; -#line 1297 "DataImportSource.c" +#line 1140 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (old) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" spit_data_imports_data_import_source_unref (old); -#line 1303 "DataImportSource.c" +#line 1146 "DataImportSource.c" } } @@ -1318,17 +1161,17 @@ void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = v_object; -#line 1322 "DataImportSource.c" +#line 1165 "DataImportSource.c" } else { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" value->data[0].v_pointer = NULL; -#line 1326 "DataImportSource.c" +#line 1169 "DataImportSource.c" } #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (old) { #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" spit_data_imports_data_import_source_unref (old); -#line 1332 "DataImportSource.c" +#line 1175 "DataImportSource.c" } } @@ -1340,7 +1183,7 @@ static void spit_data_imports_data_import_source_class_init (SpitDataImportsData ((SpitDataImportsDataImportSourceClass *) klass)->finalize = spit_data_imports_data_import_source_finalize; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_type_class_add_private (klass, sizeof (SpitDataImportsDataImportSourcePrivate)); -#line 1344 "DataImportSource.c" +#line 1187 "DataImportSource.c" } @@ -1353,7 +1196,7 @@ static void spit_data_imports_data_import_source_instance_init (SpitDataImportsD self->priv->preview_md5 = NULL; #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->ref_count = 1; -#line 1357 "DataImportSource.c" +#line 1200 "DataImportSource.c" } @@ -1371,7 +1214,7 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm _g_free0 (self->priv->preview_md5); #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _metadata_date_time_unref0 (self->priv->exposure_time); -#line 1375 "DataImportSource.c" +#line 1218 "DataImportSource.c" } @@ -1404,7 +1247,7 @@ gpointer spit_data_imports_data_import_source_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" return instance; -#line 1408 "DataImportSource.c" +#line 1251 "DataImportSource.c" } @@ -1417,7 +1260,7 @@ void spit_data_imports_data_import_source_unref (gpointer instance) { SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_GET_CLASS (self)->finalize (self); #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1421 "DataImportSource.c" +#line 1264 "DataImportSource.c" } } -- cgit v1.2.3