summaryrefslogtreecommitdiff
path: root/src/data_imports/DataImportJob.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-07-09 12:10:38 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-07-09 12:10:38 +0200
commit709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch)
tree496b2f3899e1d5728ee9ae76095cc5056c317447 /src/data_imports/DataImportJob.c
parentf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff)
parent5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff)
Merge branch 'release/0.28.3-1'0.28.3-1
Diffstat (limited to 'src/data_imports/DataImportJob.c')
-rw-r--r--src/data_imports/DataImportJob.c1207
1 files changed, 635 insertions, 572 deletions
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 5b62a91..edc0967 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -1,4 +1,4 @@
-/* DataImportJob.c generated by valac 0.36.6, the Vala compiler
+/* DataImportJob.c generated by valac 0.40.4, the Vala compiler
* generated from DataImportJob.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -259,11 +260,13 @@ struct _BatchImportJobClass {
gchar* (*get_basename) (BatchImportJob* self);
gchar* (*get_path) (BatchImportJob* self);
DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
+ GFile* (*get_associated_file) (BatchImportJob* self);
void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
time_t (*get_exposure_time_override) (BatchImportJob* self);
+ gboolean (*recurse) (BatchImportJob* self);
};
struct _SpitDataImportsDataImportJob {
@@ -333,9 +336,15 @@ extern TagSourceCollection* tag_global;
gpointer batch_import_job_ref (gpointer instance);
void batch_import_job_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_job (GValue* value, gpointer v_object);
-void value_take_batch_import_job (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_job (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_job (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_job (GValue* value,
+ gpointer v_object);
gpointer value_get_batch_import_job (const GValue* value);
GType batch_import_job_get_type (void) G_GNUC_CONST;
GType duplicated_file_get_type (void) G_GNUC_CONST;
@@ -345,40 +354,63 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
gpointer batch_import_roll_ref (gpointer instance);
void batch_import_roll_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_roll (GValue* value, gpointer v_object);
-void value_take_batch_import_roll (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_roll (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_roll (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_roll (GValue* value,
+ gpointer v_object);
gpointer value_get_batch_import_roll (const GValue* value);
GType batch_import_roll_get_type (void) G_GNUC_CONST;
GType spit_data_imports_data_import_job_get_type (void) G_GNUC_CONST;
gpointer spit_data_imports_data_import_source_ref (gpointer instance);
void spit_data_imports_data_import_source_unref (gpointer instance);
-GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object);
-void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object);
+GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void spit_data_imports_value_set_data_import_source (GValue* value,
+ gpointer v_object);
+void spit_data_imports_value_take_data_import_source (GValue* value,
+ gpointer v_object);
gpointer spit_data_imports_value_get_data_import_source (const GValue* value);
GType spit_data_imports_data_import_source_get_type (void) G_GNUC_CONST;
gpointer hierarchical_tag_index_ref (gpointer instance);
void hierarchical_tag_index_unref (gpointer instance);
-GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_hierarchical_tag_index (GValue* value, gpointer v_object);
-void value_take_hierarchical_tag_index (GValue* value, gpointer v_object);
+GParamSpec* param_spec_hierarchical_tag_index (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_hierarchical_tag_index (GValue* value,
+ gpointer v_object);
+void value_take_hierarchical_tag_index (GValue* value,
+ gpointer v_object);
gpointer value_get_hierarchical_tag_index (const GValue* value);
GType hierarchical_tag_index_get_type (void) G_GNUC_CONST;
#define SPIT_DATA_IMPORTS_DATA_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJobPrivate))
-enum {
- SPIT_DATA_IMPORTS_DATA_IMPORT_JOB_DUMMY_PROPERTY
-};
SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source);
-SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source);
+SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type,
+ SpitDataImportsDataImportSource* import_source);
BatchImportJob* batch_import_job_construct (GType object_type);
GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self);
guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self);
time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self);
-static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag** src_tags, int src_tags_length1);
-gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, int path_components_length1);
-gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1);
-static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag* tag, int* result_length1);
+static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self,
+ SpitDataImportsImportableTag** src_tags,
+ int src_tags_length1);
+gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components,
+ int path_components_length1);
+gchar** tag_prep_tag_names (gchar** names,
+ int names_length1,
+ int* result_length1);
+static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self,
+ SpitDataImportsImportableTag* tag,
+ int* result_length1);
#define TAG_PATH_SEPARATOR_STRING "/"
GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path);
HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_paths);
@@ -389,11 +421,20 @@ static gchar* spit_data_imports_data_import_job_real_get_source_identifier (Batc
static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImportJob* base);
static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base);
static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base);
-static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated);
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
+static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base,
+ BatchImportJob* associated);
+static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base,
+ guint64* filesize,
+ GFile* * file);
+static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base,
+ GFile* * file_to_import,
+ gboolean* copy_to_library,
+ GError** error);
SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self);
-static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error);
+static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base,
+ MediaSource* source,
+ BatchImportRoll* import_roll,
+ GError** error);
GType photo_source_get_type (void) G_GNUC_CONST;
GType photo_get_type (void) G_GNUC_CONST;
GType library_photo_get_type (void) G_GNUC_CONST;
@@ -404,349 +445,358 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p
gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path);
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_collection (GValue* value,
+ gpointer v_object);
+void value_take_data_collection (GValue* value,
+ gpointer v_object);
gpointer value_get_data_collection (const GValue* value);
GType data_collection_get_type (void) G_GNUC_CONST;
GType source_collection_get_type (void) G_GNUC_CONST;
GType database_source_collection_get_type (void) G_GNUC_CONST;
GType container_source_collection_get_type (void) G_GNUC_CONST;
GType tag_source_collection_get_type (void) G_GNUC_CONST;
-gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root);
+gboolean tag_source_collection_exists (TagSourceCollection* self,
+ const gchar* name,
+ gboolean treat_htags_as_root);
void tag_promote (Tag* self);
-void tag_attach (Tag* self, MediaSource* source);
+void tag_attach (Tag* self,
+ MediaSource* source);
GType prepare_input_text_options_get_type (void) G_GNUC_CONST;
-gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length);
+gchar* prepare_input_text (const gchar* text,
+ PrepareInputTextOptions options,
+ gint dest_length);
GType view_collection_get_type (void) G_GNUC_CONST;
-void event_generate_single_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name);
+void event_generate_single_event (MediaSource* media,
+ ViewCollection* events_so_far,
+ const gchar* event_name);
GType import_id_get_type (void) G_GNUC_CONST;
ImportID* import_id_dup (const ImportID* self);
void import_id_free (ImportID* self);
GType rating_get_type (void) G_GNUC_CONST;
Rating rating_unserialize (gint value);
-void media_source_set_rating (MediaSource* self, Rating rating);
-void media_source_set_title (MediaSource* self, const gchar* title);
+void media_source_set_rating (MediaSource* self,
+ Rating rating);
+void media_source_set_title (MediaSource* self,
+ const gchar* title);
GType dateable_get_type (void) G_GNUC_CONST;
-void dateable_set_exposure_time (Dateable* self, time_t target_time);
-void photo_set_import_id (Photo* self, ImportID* import_id);
+void dateable_set_exposure_time (Dateable* self,
+ time_t target_time);
+void photo_set_import_id (Photo* self,
+ ImportID* import_id);
gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag);
static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
-static gpointer _spit_data_imports_data_import_source_ref0 (gpointer self) {
+static gpointer
+_spit_data_imports_data_import_source_ref0 (gpointer self)
+{
#line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return self ? spit_data_imports_data_import_source_ref (self) : NULL;
-#line 443 "DataImportJob.c"
+#line 507 "DataImportJob.c"
}
-SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source) {
+SpitDataImportsDataImportJob*
+spit_data_imports_data_import_job_construct (GType object_type,
+ SpitDataImportsDataImportSource* import_source)
+{
SpitDataImportsDataImportJob* self = NULL;
SpitDataImportsDataImportSource* _tmp0_;
- SpitDataImportsDataImportSource* _tmp1_;
- SpitDataImportsDataImportSource* _tmp2_;
- GFile* _tmp3_;
- SpitDataImportsDataImportSource* _tmp4_;
- guint64 _tmp5_;
- SpitDataImportsDataImportSource* _tmp6_;
- time_t _tmp7_;
+ GFile* _tmp1_;
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (import_source), NULL);
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = (SpitDataImportsDataImportJob*) batch_import_job_construct (object_type);
#line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp0_ = import_source;
-#line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp1_ = _spit_data_imports_data_import_source_ref0 (_tmp0_);
+ _tmp0_ = _spit_data_imports_data_import_source_ref0 (import_source);
#line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_spit_data_imports_data_import_source_unref0 (self->priv->import_source);
#line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- self->priv->import_source = _tmp1_;
+ self->priv->import_source = _tmp0_;
#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp2_ = import_source;
-#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp3_ = spit_data_imports_data_import_source_get_file (_tmp2_);
+ _tmp1_ = spit_data_imports_data_import_source_get_file (import_source);
#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (self->priv->src_file);
#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- self->priv->src_file = _tmp3_;
-#line 25 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp4_ = import_source;
+ self->priv->src_file = _tmp1_;
#line 25 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp5_ = spit_data_imports_data_import_source_get_filesize (_tmp4_);
-#line 25 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- self->priv->filesize = _tmp5_;
-#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp6_ = import_source;
+ self->priv->filesize = spit_data_imports_data_import_source_get_filesize (import_source);
#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp7_ = spit_data_imports_data_import_source_get_exposure_time (_tmp6_);
-#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- self->priv->exposure_time = _tmp7_;
+ self->priv->exposure_time = spit_data_imports_data_import_source_get_exposure_time (import_source);
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return self;
-#line 491 "DataImportJob.c"
+#line 540 "DataImportJob.c"
}
-SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source) {
+SpitDataImportsDataImportJob*
+spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source)
+{
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return spit_data_imports_data_import_job_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, import_source);
-#line 498 "DataImportJob.c"
+#line 549 "DataImportJob.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return self ? g_object_ref (self) : NULL;
-#line 505 "DataImportJob.c"
+#line 558 "DataImportJob.c"
}
-static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag** src_tags, int src_tags_length1) {
+static HierarchicalTagIndex*
+spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self,
+ SpitDataImportsImportableTag** src_tags,
+ int src_tags_length1)
+{
HierarchicalTagIndex* result = NULL;
GeeSet* detected_htags = NULL;
GeeHashSet* _tmp0_;
- SpitDataImportsImportableTag** _tmp1_;
- gint _tmp1__length1;
- HierarchicalTagIndex* _tmp33_ = NULL;
- GeeSet* _tmp34_;
- gint _tmp35_;
- gint _tmp36_;
+ HierarchicalTagIndex* _tmp31_ = NULL;
+ GeeSet* _tmp32_;
+ gint _tmp33_;
+ gint _tmp34_;
#line 29 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
#line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
#line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
detected_htags = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
-#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp1_ = src_tags;
-#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp1__length1 = src_tags_length1;
-#line 529 "DataImportJob.c"
+#line 580 "DataImportJob.c"
{
SpitDataImportsImportableTag** src_tag_collection = NULL;
gint src_tag_collection_length1 = 0;
gint _src_tag_collection_size_ = 0;
gint src_tag_it = 0;
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_tag_collection = _tmp1_;
+ src_tag_collection = src_tags;
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_tag_collection_length1 = _tmp1__length1;
+ src_tag_collection_length1 = src_tags_length1;
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- for (src_tag_it = 0; src_tag_it < _tmp1__length1; src_tag_it = src_tag_it + 1) {
-#line 541 "DataImportJob.c"
- SpitDataImportsImportableTag* _tmp2_;
+ for (src_tag_it = 0; src_tag_it < src_tags_length1; src_tag_it = src_tag_it + 1) {
+#line 592 "DataImportJob.c"
+ SpitDataImportsImportableTag* _tmp1_;
SpitDataImportsImportableTag* src_tag = NULL;
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp2_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
+ _tmp1_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_tag = _tmp2_;
-#line 548 "DataImportJob.c"
+ src_tag = _tmp1_;
+#line 599 "DataImportJob.c"
{
gchar* prepped = NULL;
- SpitDataImportsImportableTag* _tmp3_;
- gint _tmp4_;
+ SpitDataImportsImportableTag* _tmp2_;
+ gint _tmp3_;
+ gchar** _tmp4_;
gchar** _tmp5_;
- gchar** _tmp6_;
- gint _tmp6__length1;
- gint _tmp7_;
+ gint _tmp5__length1;
+ gint _tmp6_;
+ gchar** _tmp7_;
gchar** _tmp8_;
- gchar** _tmp9_;
- gint _tmp9__length1;
+ gint _tmp8__length1;
+ gchar* _tmp9_;
gchar* _tmp10_;
- gchar* _tmp11_;
- gboolean _tmp12_ = FALSE;
- const gchar* _tmp13_;
+ gboolean _tmp11_ = FALSE;
+ const gchar* _tmp12_;
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp3_ = src_tag;
+ _tmp2_ = src_tag;
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp5_ = spit_data_imports_data_import_job_build_path_components (self, _tmp3_, &_tmp4_);
+ _tmp4_ = spit_data_imports_data_import_job_build_path_components (self, _tmp2_, &_tmp3_);
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp6__length1 = _tmp4_;
+ _tmp5__length1 = _tmp3_;
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp8_ = tag_prep_tag_names (_tmp6_, _tmp4_, &_tmp7_);
+ _tmp7_ = tag_prep_tag_names (_tmp5_, _tmp3_, &_tmp6_);
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp9__length1 = _tmp7_;
+ _tmp8__length1 = _tmp6_;
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp10_ = hierarchical_tag_utilities_join_path_components (_tmp9_, _tmp7_);
+ _tmp9_ = hierarchical_tag_utilities_join_path_components (_tmp8_, _tmp6_);
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) g_free), NULL);
+ _tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
+ _tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL);
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- prepped = _tmp11_;
-#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp13_ = prepped;
+ prepped = _tmp10_;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp13_ != NULL) {
-#line 592 "DataImportJob.c"
- const gchar* _tmp14_;
- gboolean _tmp15_;
+ _tmp12_ = prepped;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp14_ = prepped;
+ if (_tmp12_ != NULL) {
+#line 643 "DataImportJob.c"
+ const gchar* _tmp13_;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING);
+ _tmp13_ = prepped;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp12_ = _tmp15_;
-#line 601 "DataImportJob.c"
+ _tmp11_ = g_str_has_prefix (_tmp13_, TAG_PATH_SEPARATOR_STRING);
+#line 649 "DataImportJob.c"
} else {
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp12_ = FALSE;
-#line 605 "DataImportJob.c"
+ _tmp11_ = FALSE;
+#line 653 "DataImportJob.c"
}
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp12_) {
-#line 609 "DataImportJob.c"
- GeeSet* _tmp16_;
- const gchar* _tmp17_;
+ if (_tmp11_) {
+#line 657 "DataImportJob.c"
+ GeeSet* _tmp14_;
+ const gchar* _tmp15_;
GeeList* parents = NULL;
- const gchar* _tmp18_;
- GeeList* _tmp19_;
+ const gchar* _tmp16_;
+ GeeList* _tmp17_;
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp16_ = detected_htags;
+ _tmp14_ = detected_htags;
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp17_ = prepped;
+ _tmp15_ = prepped;
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_);
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
#line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp18_ = prepped;
+ _tmp16_ = prepped;
#line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp19_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp18_);
+ _tmp17_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp16_);
#line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- parents = _tmp19_;
-#line 627 "DataImportJob.c"
+ parents = _tmp17_;
+#line 675 "DataImportJob.c"
{
GeeList* _parent_list = NULL;
- GeeList* _tmp20_;
- GeeList* _tmp21_;
+ GeeList* _tmp18_;
+ GeeList* _tmp19_;
gint _parent_size = 0;
- GeeList* _tmp22_;
- gint _tmp23_;
- gint _tmp24_;
+ GeeList* _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
gint _parent_index = 0;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp20_ = parents;
+ _tmp18_ = parents;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp21_ = _g_object_ref0 (_tmp20_);
+ _tmp19_ = _g_object_ref0 (_tmp18_);
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _parent_list = _tmp21_;
+ _parent_list = _tmp19_;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp22_ = _parent_list;
+ _tmp20_ = _parent_list;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp24_ = _tmp23_;
+ _tmp22_ = _tmp21_;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _parent_size = _tmp24_;
+ _parent_size = _tmp22_;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_parent_index = -1;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
while (TRUE) {
-#line 655 "DataImportJob.c"
+#line 703 "DataImportJob.c"
+ gint _tmp23_;
+ gint _tmp24_;
gint _tmp25_;
- gint _tmp26_;
- gint _tmp27_;
gchar* parent = NULL;
- GeeList* _tmp28_;
- gint _tmp29_;
- gpointer _tmp30_;
- GeeSet* _tmp31_;
- const gchar* _tmp32_;
+ GeeList* _tmp26_;
+ gint _tmp27_;
+ gpointer _tmp28_;
+ GeeSet* _tmp29_;
+ const gchar* _tmp30_;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp25_ = _parent_index;
+ _tmp23_ = _parent_index;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _parent_index = _tmp25_ + 1;
+ _parent_index = _tmp23_ + 1;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp26_ = _parent_index;
+ _tmp24_ = _parent_index;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp27_ = _parent_size;
+ _tmp25_ = _parent_size;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (!(_tmp26_ < _tmp27_)) {
+ if (!(_tmp24_ < _tmp25_)) {
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
break;
-#line 677 "DataImportJob.c"
+#line 725 "DataImportJob.c"
}
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp28_ = _parent_list;
+ _tmp26_ = _parent_list;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp29_ = _parent_index;
+ _tmp27_ = _parent_index;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp30_ = gee_list_get (_tmp28_, _tmp29_);
+ _tmp28_ = gee_list_get (_tmp26_, _tmp27_);
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- parent = (gchar*) _tmp30_;
+ parent = (gchar*) _tmp28_;
#line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp31_ = detected_htags;
+ _tmp29_ = detected_htags;
#line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp32_ = parent;
+ _tmp30_ = parent;
#line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp32_);
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_);
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (parent);
-#line 695 "DataImportJob.c"
+#line 743 "DataImportJob.c"
}
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_parent_list);
-#line 699 "DataImportJob.c"
+#line 747 "DataImportJob.c"
}
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (parents);
-#line 703 "DataImportJob.c"
+#line 751 "DataImportJob.c"
}
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (prepped);
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (src_tag);
-#line 709 "DataImportJob.c"
+#line 757 "DataImportJob.c"
}
}
}
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp34_ = detected_htags;
+ _tmp32_ = detected_htags;
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp36_ = _tmp35_;
+ _tmp34_ = _tmp33_;
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp36_ > 0) {
-#line 721 "DataImportJob.c"
- GeeSet* _tmp37_;
- HierarchicalTagIndex* _tmp38_;
+ if (_tmp34_ > 0) {
+#line 769 "DataImportJob.c"
+ GeeSet* _tmp35_;
+ HierarchicalTagIndex* _tmp36_;
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp37_ = detected_htags;
+ _tmp35_ = detected_htags;
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp38_ = hierarchical_tag_index_from_paths (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp36_ = hierarchical_tag_index_from_paths (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection));
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _hierarchical_tag_index_unref0 (_tmp33_);
+ _hierarchical_tag_index_unref0 (_tmp31_);
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp33_ = _tmp38_;
-#line 732 "DataImportJob.c"
+ _tmp31_ = _tmp36_;
+#line 780 "DataImportJob.c"
} else {
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _hierarchical_tag_index_unref0 (_tmp33_);
+ _hierarchical_tag_index_unref0 (_tmp31_);
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp33_ = NULL;
-#line 738 "DataImportJob.c"
+ _tmp31_ = NULL;
+#line 786 "DataImportJob.c"
}
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- result = _tmp33_;
+ result = _tmp31_;
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (detected_htags);
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 746 "DataImportJob.c"
+#line 794 "DataImportJob.c"
}
-time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self) {
+time_t
+spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self)
+{
time_t result = 0;
time_t _tmp0_;
#line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -757,11 +807,13 @@ time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataI
result = _tmp0_;
#line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 761 "DataImportJob.c"
+#line 811 "DataImportJob.c"
}
-static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchImportJob* base) {
+static gchar*
+spit_data_imports_data_import_job_real_get_dest_identifier (BatchImportJob* base)
+{
SpitDataImportsDataImportJob * self;
gchar* result = NULL;
SpitDataImportsDataImportSource* _tmp0_;
@@ -776,11 +828,13 @@ static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchI
result = _tmp1_;
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 780 "DataImportJob.c"
+#line 832 "DataImportJob.c"
}
-static gchar* spit_data_imports_data_import_job_real_get_source_identifier (BatchImportJob* base) {
+static gchar*
+spit_data_imports_data_import_job_real_get_source_identifier (BatchImportJob* base)
+{
SpitDataImportsDataImportJob * self;
gchar* result = NULL;
SpitDataImportsDataImportSource* _tmp0_;
@@ -795,11 +849,13 @@ static gchar* spit_data_imports_data_import_job_real_get_source_identifier (Batc
result = _tmp1_;
#line 60 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 799 "DataImportJob.c"
+#line 853 "DataImportJob.c"
}
-static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImportJob* base) {
+static gboolean
+spit_data_imports_data_import_job_real_is_directory (BatchImportJob* base)
+{
SpitDataImportsDataImportJob * self;
gboolean result = FALSE;
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -808,11 +864,13 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
result = FALSE;
#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 812 "DataImportJob.c"
+#line 868 "DataImportJob.c"
}
-static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base) {
+static gchar*
+spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base)
+{
SpitDataImportsDataImportJob * self;
gchar* result = NULL;
GFile* _tmp0_;
@@ -827,11 +885,13 @@ static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJo
result = _tmp1_;
#line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 831 "DataImportJob.c"
+#line 889 "DataImportJob.c"
}
-static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base) {
+static gchar*
+spit_data_imports_data_import_job_real_get_path (BatchImportJob* base)
+{
SpitDataImportsDataImportJob * self;
gchar* result = NULL;
GFile* _tmp0_;
@@ -857,38 +917,44 @@ static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* b
result = _tmp4_;
#line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 861 "DataImportJob.c"
+#line 921 "DataImportJob.c"
}
-static gpointer _batch_import_job_ref0 (gpointer self) {
+static gpointer
+_batch_import_job_ref0 (gpointer self)
+{
#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return self ? batch_import_job_ref (self) : NULL;
-#line 868 "DataImportJob.c"
+#line 930 "DataImportJob.c"
}
-static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
+static void
+spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base,
+ BatchImportJob* associated)
+{
SpitDataImportsDataImportJob * self;
- BatchImportJob* _tmp0_;
- SpitDataImportsDataImportJob* _tmp1_;
+ SpitDataImportsDataImportJob* _tmp0_;
#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_return_if_fail (IS_BATCH_IMPORT_JOB (associated));
#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp0_ = associated;
-#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB) ? ((SpitDataImportsDataImportJob*) _tmp0_) : NULL);
+ _tmp0_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (associated, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB) ? ((SpitDataImportsDataImportJob*) associated) : NULL);
#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_batch_import_job_unref0 (self->priv->associated);
#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- self->priv->associated = _tmp1_;
-#line 888 "DataImportJob.c"
+ self->priv->associated = _tmp0_;
+#line 950 "DataImportJob.c"
}
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) {
+static gboolean
+spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base,
+ guint64* filesize,
+ GFile* * file)
+{
SpitDataImportsDataImportJob * self;
guint64 _vala_filesize = 0ULL;
GFile* _vala_file = NULL;
@@ -910,25 +976,30 @@ static gboolean spit_data_imports_data_import_job_real_determine_file_size (Batc
if (filesize) {
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
*filesize = _vala_filesize;
-#line 914 "DataImportJob.c"
+#line 980 "DataImportJob.c"
}
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (file) {
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
*file = _vala_file;
-#line 920 "DataImportJob.c"
+#line 986 "DataImportJob.c"
} else {
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_vala_file);
-#line 924 "DataImportJob.c"
+#line 990 "DataImportJob.c"
}
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 928 "DataImportJob.c"
+#line 994 "DataImportJob.c"
}
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
+static gboolean
+spit_data_imports_data_import_job_real_prepare (BatchImportJob* base,
+ GFile* * file_to_import,
+ gboolean* copy_to_library,
+ GError** error)
+{
SpitDataImportsDataImportJob * self;
GFile* _vala_file_to_import = NULL;
gboolean _vala_copy_to_library = FALSE;
@@ -983,66 +1054,68 @@ static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob*
if (file_to_import) {
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
*file_to_import = _vala_file_to_import;
-#line 987 "DataImportJob.c"
+#line 1058 "DataImportJob.c"
} else {
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 991 "DataImportJob.c"
+#line 1062 "DataImportJob.c"
}
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (copy_to_library) {
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
*copy_to_library = _vala_copy_to_library;
-#line 997 "DataImportJob.c"
+#line 1068 "DataImportJob.c"
}
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 1001 "DataImportJob.c"
+#line 1072 "DataImportJob.c"
}
-static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error) {
+static gboolean
+spit_data_imports_data_import_job_real_complete (BatchImportJob* base,
+ MediaSource* source,
+ BatchImportRoll* import_roll,
+ GError** error)
+{
SpitDataImportsDataImportJob * self;
gboolean result = FALSE;
LibraryPhoto* photo = NULL;
- MediaSource* _tmp0_;
+ LibraryPhoto* _tmp0_;
LibraryPhoto* _tmp1_;
- LibraryPhoto* _tmp2_;
SpitDataImportsImportableMediaItem* src_photo = NULL;
- SpitDataImportsDataImportSource* _tmp3_;
- SpitDataImportsImportableMediaItem* _tmp4_;
- HierarchicalTagIndex* _tmp5_;
+ SpitDataImportsDataImportSource* _tmp2_;
+ SpitDataImportsImportableMediaItem* _tmp3_;
+ HierarchicalTagIndex* _tmp4_;
SpitDataImportsImportableTag** src_tags = NULL;
- SpitDataImportsImportableMediaItem* _tmp17_;
- gint _tmp18_;
- SpitDataImportsImportableTag** _tmp19_;
+ SpitDataImportsImportableMediaItem* _tmp15_;
+ gint _tmp16_;
+ SpitDataImportsImportableTag** _tmp17_;
gint src_tags_length1;
gint _src_tags_size_;
- SpitDataImportsImportableTag** _tmp20_;
- gint _tmp20__length1;
+ SpitDataImportsImportableTag** _tmp18_;
+ gint _tmp18__length1;
SpitDataImportsImportableEvent* src_event = NULL;
- SpitDataImportsImportableMediaItem* _tmp61_;
- SpitDataImportsImportableEvent* _tmp62_;
- SpitDataImportsImportableEvent* _tmp63_;
+ SpitDataImportsImportableMediaItem* _tmp57_;
+ SpitDataImportsImportableEvent* _tmp58_;
+ SpitDataImportsImportableEvent* _tmp59_;
Rating dst_rating = 0;
SpitDataImportsImportableRating* src_rating = NULL;
- SpitDataImportsImportableMediaItem* _tmp74_;
- SpitDataImportsImportableRating* _tmp75_;
- SpitDataImportsImportableRating* _tmp76_;
- gboolean _tmp77_;
- LibraryPhoto* _tmp83_;
- Rating _tmp84_;
+ SpitDataImportsImportableMediaItem* _tmp69_;
+ SpitDataImportsImportableRating* _tmp70_;
+ SpitDataImportsImportableRating* _tmp71_;
+ LibraryPhoto* _tmp74_;
+ Rating _tmp75_;
gchar* title = NULL;
- SpitDataImportsImportableMediaItem* _tmp85_;
- gchar* _tmp86_;
- const gchar* _tmp87_;
+ SpitDataImportsImportableMediaItem* _tmp76_;
+ gchar* _tmp77_;
+ const gchar* _tmp78_;
time_t* date_time = NULL;
- SpitDataImportsImportableMediaItem* _tmp90_;
- time_t* _tmp91_;
- time_t* _tmp92_;
- LibraryPhoto* _tmp95_;
- BatchImportRoll* _tmp96_;
- ImportID _tmp97_;
+ SpitDataImportsImportableMediaItem* _tmp81_;
+ time_t* _tmp82_;
+ time_t* _tmp83_;
+ LibraryPhoto* _tmp86_;
+ ImportID _tmp87_;
#line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1050,291 +1123,280 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_return_val_if_fail (IS_BATCH_IMPORT_ROLL (import_roll), FALSE);
#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp0_ = source;
-#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) source) : NULL);
#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- photo = _tmp1_;
+ photo = _tmp0_;
#line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp2_ = photo;
+ _tmp1_ = photo;
#line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp2_ == NULL) {
+ if (_tmp1_ == NULL) {
#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
result = FALSE;
#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (photo);
#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 1069 "DataImportJob.c"
+#line 1140 "DataImportJob.c"
}
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp3_ = self->priv->import_source;
+ _tmp2_ = self->priv->import_source;
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp4_ = spit_data_imports_data_import_source_get_photo (_tmp3_);
+ _tmp3_ = spit_data_imports_data_import_source_get_photo (_tmp2_);
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_photo = _tmp4_;
+ src_photo = _tmp3_;
#line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp5_ = self->priv->detected_htags;
+ _tmp4_ = self->priv->detected_htags;
#line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp5_ != NULL) {
-#line 1081 "DataImportJob.c"
+ if (_tmp4_ != NULL) {
+#line 1152 "DataImportJob.c"
GeeCollection* paths = NULL;
- HierarchicalTagIndex* _tmp6_;
- GeeCollection* _tmp7_;
+ HierarchicalTagIndex* _tmp5_;
+ GeeCollection* _tmp6_;
#line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp6_ = self->priv->detected_htags;
+ _tmp5_ = self->priv->detected_htags;
#line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp7_ = hierarchical_tag_index_get_all_paths (_tmp6_);
+ _tmp6_ = hierarchical_tag_index_get_all_paths (_tmp5_);
#line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- paths = _tmp7_;
-#line 1091 "DataImportJob.c"
+ paths = _tmp6_;
+#line 1162 "DataImportJob.c"
{
GeeIterator* _path_it = NULL;
- GeeCollection* _tmp8_;
- GeeIterator* _tmp9_;
+ GeeCollection* _tmp7_;
+ GeeIterator* _tmp8_;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp8_ = paths;
+ _tmp7_ = paths;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _path_it = _tmp9_;
+ _path_it = _tmp8_;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
while (TRUE) {
-#line 1104 "DataImportJob.c"
- GeeIterator* _tmp10_;
- gboolean _tmp11_;
+#line 1175 "DataImportJob.c"
+ GeeIterator* _tmp9_;
gchar* path = NULL;
- GeeIterator* _tmp12_;
- gpointer _tmp13_;
- const gchar* _tmp14_;
- Tag* _tmp15_;
- Tag* _tmp16_;
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp10_ = _path_it;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
+ const gchar* _tmp12_;
+ Tag* _tmp13_;
+ Tag* _tmp14_;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp11_ = gee_iterator_next (_tmp10_);
+ _tmp9_ = _path_it;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (!_tmp11_) {
+ if (!gee_iterator_next (_tmp9_)) {
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
break;
-#line 1121 "DataImportJob.c"
+#line 1189 "DataImportJob.c"
}
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp12_ = _path_it;
+ _tmp10_ = _path_it;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp13_ = gee_iterator_get (_tmp12_);
+ _tmp11_ = gee_iterator_get (_tmp10_);
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- path = (gchar*) _tmp13_;
+ path = (gchar*) _tmp11_;
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp14_ = path;
+ _tmp12_ = path;
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp15_ = tag_for_path (_tmp14_);
+ _tmp13_ = tag_for_path (_tmp12_);
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp16_ = _tmp15_;
+ _tmp14_ = _tmp13_;
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _g_object_unref0 (_tmp16_);
+ _g_object_unref0 (_tmp14_);
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (path);
-#line 1139 "DataImportJob.c"
+#line 1207 "DataImportJob.c"
}
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_path_it);
-#line 1143 "DataImportJob.c"
+#line 1211 "DataImportJob.c"
}
#line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (paths);
-#line 1147 "DataImportJob.c"
+#line 1215 "DataImportJob.c"
}
#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp17_ = src_photo;
+ _tmp15_ = src_photo;
#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp19_ = spit_data_imports_importable_media_item_get_tags (_tmp17_, &_tmp18_);
+ _tmp17_ = spit_data_imports_importable_media_item_get_tags (_tmp15_, &_tmp16_);
#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_tags = _tmp19_;
+ src_tags = _tmp17_;
#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_tags_length1 = _tmp18_;
+ src_tags_length1 = _tmp16_;
#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_src_tags_size_ = src_tags_length1;
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp20_ = src_tags;
+ _tmp18_ = src_tags;
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp20__length1 = src_tags_length1;
-#line 1163 "DataImportJob.c"
+ _tmp18__length1 = src_tags_length1;
+#line 1231 "DataImportJob.c"
{
SpitDataImportsImportableTag** src_tag_collection = NULL;
gint src_tag_collection_length1 = 0;
gint _src_tag_collection_size_ = 0;
gint src_tag_it = 0;
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_tag_collection = _tmp20_;
+ src_tag_collection = _tmp18_;
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_tag_collection_length1 = _tmp20__length1;
+ src_tag_collection_length1 = _tmp18__length1;
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- for (src_tag_it = 0; src_tag_it < _tmp20__length1; src_tag_it = src_tag_it + 1) {
-#line 1175 "DataImportJob.c"
- SpitDataImportsImportableTag* _tmp21_;
+ for (src_tag_it = 0; src_tag_it < _tmp18__length1; src_tag_it = src_tag_it + 1) {
+#line 1243 "DataImportJob.c"
+ SpitDataImportsImportableTag* _tmp19_;
SpitDataImportsImportableTag* src_tag = NULL;
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp21_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
+ _tmp19_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_tag = _tmp21_;
-#line 1182 "DataImportJob.c"
+ src_tag = _tmp19_;
+#line 1250 "DataImportJob.c"
{
gchar* prepped = NULL;
- SpitDataImportsImportableTag* _tmp22_;
- gint _tmp23_;
- gchar** _tmp24_;
+ SpitDataImportsImportableTag* _tmp20_;
+ gint _tmp21_;
+ gchar** _tmp22_;
+ gchar** _tmp23_;
+ gint _tmp23__length1;
+ gint _tmp24_;
gchar** _tmp25_;
- gint _tmp25__length1;
- gint _tmp26_;
- gchar** _tmp27_;
- gchar** _tmp28_;
- gint _tmp28__length1;
- gchar* _tmp29_;
- gchar* _tmp30_;
- const gchar* _tmp31_;
+ gchar** _tmp26_;
+ gint _tmp26__length1;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+ const gchar* _tmp29_;
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp22_ = src_tag;
+ _tmp20_ = src_tag;
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp24_ = spit_data_imports_data_import_job_build_path_components (self, _tmp22_, &_tmp23_);
+ _tmp22_ = spit_data_imports_data_import_job_build_path_components (self, _tmp20_, &_tmp21_);
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp25_ = _tmp24_;
+ _tmp23_ = _tmp22_;
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp25__length1 = _tmp23_;
+ _tmp23__length1 = _tmp21_;
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp27_ = tag_prep_tag_names (_tmp25_, _tmp23_, &_tmp26_);
+ _tmp25_ = tag_prep_tag_names (_tmp23_, _tmp21_, &_tmp24_);
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp28_ = _tmp27_;
+ _tmp26_ = _tmp25_;
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp28__length1 = _tmp26_;
+ _tmp26__length1 = _tmp24_;
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp29_ = hierarchical_tag_utilities_join_path_components (_tmp28_, _tmp26_);
+ _tmp27_ = hierarchical_tag_utilities_join_path_components (_tmp26_, _tmp24_);
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp30_ = _tmp29_;
+ _tmp28_ = _tmp27_;
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp28_ = (_vala_array_free (_tmp28_, _tmp28__length1, (GDestroyNotify) g_free), NULL);
+ _tmp26_ = (_vala_array_free (_tmp26_, _tmp26__length1, (GDestroyNotify) g_free), NULL);
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp25_ = (_vala_array_free (_tmp25_, _tmp25__length1, (GDestroyNotify) g_free), NULL);
+ _tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_free), NULL);
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- prepped = _tmp30_;
+ prepped = _tmp28_;
#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp31_ = prepped;
+ _tmp29_ = prepped;
#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp31_ != NULL) {
-#line 1225 "DataImportJob.c"
- const gchar* _tmp32_;
- GeeList* _tmp33_;
- GeeList* _tmp34_;
- gint _tmp35_;
- gint _tmp36_;
- gboolean _tmp37_;
- const gchar* _tmp57_;
- Tag* _tmp58_;
- Tag* _tmp59_;
- LibraryPhoto* _tmp60_;
+ if (_tmp29_ != NULL) {
+#line 1293 "DataImportJob.c"
+ const gchar* _tmp30_;
+ GeeList* _tmp31_;
+ GeeList* _tmp32_;
+ gint _tmp33_;
+ gint _tmp34_;
+ gboolean _tmp35_;
+ const gchar* _tmp53_;
+ Tag* _tmp54_;
+ Tag* _tmp55_;
+ LibraryPhoto* _tmp56_;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp32_ = prepped;
+ _tmp30_ = prepped;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp33_ = hierarchical_tag_utilities_enumerate_path_components (_tmp32_);
+ _tmp31_ = hierarchical_tag_utilities_enumerate_path_components (_tmp30_);
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp34_ = _tmp33_;
+ _tmp32_ = _tmp31_;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp36_ = _tmp35_;
+ _tmp34_ = _tmp33_;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp37_ = _tmp36_ == 1;
+ _tmp35_ = _tmp34_ == 1;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _g_object_unref0 (_tmp34_);
+ _g_object_unref0 (_tmp32_);
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp37_) {
-#line 1252 "DataImportJob.c"
- const gchar* _tmp38_;
- gboolean _tmp39_;
+ if (_tmp35_) {
+#line 1320 "DataImportJob.c"
+ const gchar* _tmp36_;
#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp38_ = prepped;
+ _tmp36_ = prepped;
#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp39_ = g_str_has_prefix (_tmp38_, TAG_PATH_SEPARATOR_STRING);
-#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp39_) {
-#line 1261 "DataImportJob.c"
- const gchar* _tmp40_;
- gchar* _tmp41_;
+ if (g_str_has_prefix (_tmp36_, TAG_PATH_SEPARATOR_STRING)) {
+#line 1326 "DataImportJob.c"
+ const gchar* _tmp37_;
+ gchar* _tmp38_;
#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp40_ = prepped;
+ _tmp37_ = prepped;
#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp41_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp40_);
+ _tmp38_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp37_);
#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (prepped);
#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- prepped = _tmp41_;
-#line 1272 "DataImportJob.c"
+ prepped = _tmp38_;
+#line 1337 "DataImportJob.c"
}
} else {
GeeList* parents = NULL;
- const gchar* _tmp42_;
- GeeList* _tmp43_;
- GeeList* _tmp44_;
- gint _tmp45_;
- gint _tmp46_;
+ const gchar* _tmp39_;
+ GeeList* _tmp40_;
+ GeeList* _tmp41_;
+ gint _tmp42_;
+ gint _tmp43_;
gchar* top_level_parent = NULL;
- GeeList* _tmp47_;
- gpointer _tmp48_;
+ GeeList* _tmp44_;
+ gpointer _tmp45_;
gchar* flat_top_level_parent = NULL;
+ const gchar* _tmp46_;
+ gchar* _tmp47_;
+ TagSourceCollection* _tmp48_;
const gchar* _tmp49_;
- gchar* _tmp50_;
- TagSourceCollection* _tmp51_;
- const gchar* _tmp52_;
- gboolean _tmp53_;
#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp42_ = prepped;
+ _tmp39_ = prepped;
#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp43_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp42_);
+ _tmp40_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp39_);
#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- parents = _tmp43_;
+ parents = _tmp40_;
#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp44_ = parents;
+ _tmp41_ = parents;
#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp45_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp42_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection));
#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp46_ = _tmp45_;
+ _tmp43_ = _tmp42_;
#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _vala_assert (_tmp46_ > 0, "parents.size > 0");
+ _vala_assert (_tmp43_ > 0, "parents.size > 0");
#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp47_ = parents;
+ _tmp44_ = parents;
#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp48_ = gee_list_get (_tmp47_, 0);
+ _tmp45_ = gee_list_get (_tmp44_, 0);
#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- top_level_parent = (gchar*) _tmp48_;
+ top_level_parent = (gchar*) _tmp45_;
#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp49_ = top_level_parent;
+ _tmp46_ = top_level_parent;
#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp50_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp49_);
+ _tmp47_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp46_);
#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- flat_top_level_parent = _tmp50_;
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp51_ = tag_global;
+ flat_top_level_parent = _tmp47_;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp52_ = flat_top_level_parent;
+ _tmp48_ = tag_global;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp53_ = tag_source_collection_exists (_tmp51_, _tmp52_, FALSE);
+ _tmp49_ = flat_top_level_parent;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp53_) {
-#line 1324 "DataImportJob.c"
- const gchar* _tmp54_;
- Tag* _tmp55_;
- Tag* _tmp56_;
+ if (tag_source_collection_exists (_tmp48_, _tmp49_, FALSE)) {
+#line 1386 "DataImportJob.c"
+ const gchar* _tmp50_;
+ Tag* _tmp51_;
+ Tag* _tmp52_;
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp54_ = flat_top_level_parent;
+ _tmp50_ = flat_top_level_parent;
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp55_ = tag_for_path (_tmp54_);
+ _tmp51_ = tag_for_path (_tmp50_);
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp56_ = _tmp55_;
+ _tmp52_ = _tmp51_;
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- tag_promote (_tmp56_);
+ tag_promote (_tmp52_);
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _g_object_unref0 (_tmp56_);
-#line 1338 "DataImportJob.c"
+ _g_object_unref0 (_tmp52_);
+#line 1400 "DataImportJob.c"
}
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (flat_top_level_parent);
@@ -1342,185 +1404,169 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_g_free0 (top_level_parent);
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (parents);
-#line 1346 "DataImportJob.c"
+#line 1408 "DataImportJob.c"
}
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp57_ = prepped;
+ _tmp53_ = prepped;
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp58_ = tag_for_path (_tmp57_);
+ _tmp54_ = tag_for_path (_tmp53_);
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp59_ = _tmp58_;
+ _tmp55_ = _tmp54_;
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp60_ = photo;
+ _tmp56_ = photo;
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
+ tag_attach (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_MEDIA_SOURCE, MediaSource));
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _g_object_unref0 (_tmp59_);
-#line 1360 "DataImportJob.c"
+ _g_object_unref0 (_tmp55_);
+#line 1422 "DataImportJob.c"
}
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (prepped);
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (src_tag);
-#line 1366 "DataImportJob.c"
+#line 1428 "DataImportJob.c"
}
}
}
#line 139 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp61_ = src_photo;
+ _tmp57_ = src_photo;
#line 139 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp62_ = spit_data_imports_importable_media_item_get_event (_tmp61_);
+ _tmp58_ = spit_data_imports_importable_media_item_get_event (_tmp57_);
#line 139 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_event = _tmp62_;
+ src_event = _tmp58_;
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp63_ = src_event;
+ _tmp59_ = src_event;
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp63_ != NULL) {
-#line 1380 "DataImportJob.c"
+ if (_tmp59_ != NULL) {
+#line 1442 "DataImportJob.c"
gchar* prepped = NULL;
- SpitDataImportsImportableEvent* _tmp64_;
- gchar* _tmp65_;
- gchar* _tmp66_;
- gchar* _tmp67_;
- gchar* _tmp68_;
- const gchar* _tmp69_;
+ SpitDataImportsImportableEvent* _tmp60_;
+ gchar* _tmp61_;
+ gchar* _tmp62_;
+ gchar* _tmp63_;
+ gchar* _tmp64_;
+ const gchar* _tmp65_;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp64_ = src_event;
+ _tmp60_ = src_event;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp65_ = spit_data_imports_importable_event_get_name (_tmp64_);
+ _tmp61_ = spit_data_imports_importable_event_get_name (_tmp60_);
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp66_ = _tmp65_;
+ _tmp62_ = _tmp61_;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp67_ = prepare_input_text (_tmp66_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1);
+ _tmp63_ = prepare_input_text (_tmp62_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1);
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp68_ = _tmp67_;
+ _tmp64_ = _tmp63_;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _g_free0 (_tmp66_);
+ _g_free0 (_tmp62_);
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- prepped = _tmp68_;
+ prepped = _tmp64_;
#line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp69_ = prepped;
+ _tmp65_ = prepped;
#line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp69_ != NULL) {
-#line 1406 "DataImportJob.c"
- LibraryPhoto* _tmp70_;
- BatchImportRoll* _tmp71_;
- ViewCollection* _tmp72_;
- const gchar* _tmp73_;
+ if (_tmp65_ != NULL) {
+#line 1468 "DataImportJob.c"
+ LibraryPhoto* _tmp66_;
+ ViewCollection* _tmp67_;
+ const gchar* _tmp68_;
#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp70_ = photo;
+ _tmp66_ = photo;
#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp71_ = import_roll;
+ _tmp67_ = import_roll->generated_events;
#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp72_ = _tmp71_->generated_events;
+ _tmp68_ = prepped;
#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp73_ = prepped;
-#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_SOURCE, MediaSource), _tmp72_, _tmp73_);
-#line 1421 "DataImportJob.c"
+ event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_MEDIA_SOURCE, MediaSource), _tmp67_, _tmp68_);
+#line 1480 "DataImportJob.c"
}
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (prepped);
-#line 1425 "DataImportJob.c"
+#line 1484 "DataImportJob.c"
}
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp74_ = src_photo;
+ _tmp69_ = src_photo;
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp75_ = spit_data_imports_importable_media_item_get_rating (_tmp74_);
+ _tmp70_ = spit_data_imports_importable_media_item_get_rating (_tmp69_);
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- src_rating = _tmp75_;
-#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp76_ = src_rating;
+ src_rating = _tmp70_;
#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp77_ = spit_data_imports_importable_rating_is_rejected (_tmp76_);
+ _tmp71_ = src_rating;
#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp77_) {
+ if (spit_data_imports_importable_rating_is_rejected (_tmp71_)) {
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
dst_rating = RATING_REJECTED;
-#line 1441 "DataImportJob.c"
+#line 1498 "DataImportJob.c"
} else {
- SpitDataImportsImportableRating* _tmp78_;
- gboolean _tmp79_;
+ SpitDataImportsImportableRating* _tmp72_;
#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp78_ = src_rating;
+ _tmp72_ = src_rating;
#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp79_ = spit_data_imports_importable_rating_is_unrated (_tmp78_);
-#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp79_) {
+ if (spit_data_imports_importable_rating_is_unrated (_tmp72_)) {
#line 152 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
dst_rating = RATING_UNRATED;
-#line 1453 "DataImportJob.c"
+#line 1507 "DataImportJob.c"
} else {
- SpitDataImportsImportableRating* _tmp80_;
- gint _tmp81_;
- Rating _tmp82_;
-#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp80_ = src_rating;
+ SpitDataImportsImportableRating* _tmp73_;
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp81_ = spit_data_imports_importable_rating_get_value (_tmp80_);
+ _tmp73_ = src_rating;
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp82_ = rating_unserialize (_tmp81_);
-#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- dst_rating = _tmp82_;
-#line 1466 "DataImportJob.c"
+ dst_rating = rating_unserialize (spit_data_imports_importable_rating_get_value (_tmp73_));
+#line 1514 "DataImportJob.c"
}
}
#line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp83_ = photo;
+ _tmp74_ = photo;
#line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp84_ = dst_rating;
+ _tmp75_ = dst_rating;
#line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, TYPE_MEDIA_SOURCE, MediaSource), _tmp84_);
+ media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_MEDIA_SOURCE, MediaSource), _tmp75_);
#line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp85_ = src_photo;
+ _tmp76_ = src_photo;
#line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp86_ = spit_data_imports_importable_media_item_get_title (_tmp85_);
+ _tmp77_ = spit_data_imports_importable_media_item_get_title (_tmp76_);
#line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- title = _tmp86_;
+ title = _tmp77_;
#line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp87_ = title;
+ _tmp78_ = title;
#line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp87_ != NULL) {
-#line 1485 "DataImportJob.c"
- LibraryPhoto* _tmp88_;
- const gchar* _tmp89_;
+ if (_tmp78_ != NULL) {
+#line 1533 "DataImportJob.c"
+ LibraryPhoto* _tmp79_;
+ const gchar* _tmp80_;
#line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp88_ = photo;
+ _tmp79_ = photo;
#line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp89_ = title;
+ _tmp80_ = title;
#line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_MEDIA_SOURCE, MediaSource), _tmp89_);
-#line 1494 "DataImportJob.c"
+ media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_MEDIA_SOURCE, MediaSource), _tmp80_);
+#line 1542 "DataImportJob.c"
}
#line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp90_ = src_photo;
+ _tmp81_ = src_photo;
#line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp91_ = spit_data_imports_importable_media_item_get_exposure_time (_tmp90_);
+ _tmp82_ = spit_data_imports_importable_media_item_get_exposure_time (_tmp81_);
#line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- date_time = _tmp91_;
+ date_time = _tmp82_;
#line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp92_ = date_time;
+ _tmp83_ = date_time;
#line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (_tmp92_ != NULL) {
-#line 1506 "DataImportJob.c"
- LibraryPhoto* _tmp93_;
- time_t* _tmp94_;
+ if (_tmp83_ != NULL) {
+#line 1554 "DataImportJob.c"
+ LibraryPhoto* _tmp84_;
+ time_t* _tmp85_;
#line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp93_ = photo;
+ _tmp84_ = photo;
#line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp94_ = date_time;
+ _tmp85_ = date_time;
#line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_DATEABLE, Dateable), *_tmp94_);
-#line 1515 "DataImportJob.c"
+ dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_DATEABLE, Dateable), *_tmp85_);
+#line 1563 "DataImportJob.c"
}
#line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp95_ = photo;
-#line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp96_ = import_roll;
+ _tmp86_ = photo;
#line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp97_ = _tmp96_->import_id;
+ _tmp87_ = import_roll->import_id;
#line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- photo_set_import_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, TYPE_PHOTO, Photo), &_tmp97_);
+ photo_set_import_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_PHOTO, Photo), &_tmp87_);
#line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
result = TRUE;
#line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1539,19 +1585,23 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_g_object_unref0 (photo);
#line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 1543 "DataImportJob.c"
+#line 1589 "DataImportJob.c"
}
-static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag* tag, int* result_length1) {
+static gchar**
+spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self,
+ SpitDataImportsImportableTag* tag,
+ int* result_length1)
+{
gchar** result = NULL;
GeeList* components = NULL;
GeeLinkedList* _tmp0_;
- GeeList* _tmp13_;
- gint _tmp14_;
- gpointer* _tmp15_;
- gchar** _tmp16_;
- gint _tmp16__length1;
+ GeeList* _tmp12_;
+ gint _tmp13_;
+ gpointer* _tmp14_;
+ gchar** _tmp15_;
+ gint _tmp15__length1;
#line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
#line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1560,107 +1610,106 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
_tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
components = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 1564 "DataImportJob.c"
+#line 1614 "DataImportJob.c"
{
SpitDataImportsImportableTag* current_tag = NULL;
SpitDataImportsImportableTag* _tmp1_;
- SpitDataImportsImportableTag* _tmp2_;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp1_ = tag;
+ _tmp1_ = _g_object_ref0 (tag);
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
-#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- current_tag = _tmp2_;
-#line 1575 "DataImportJob.c"
+ current_tag = _tmp1_;
+#line 1622 "DataImportJob.c"
{
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp2_ = FALSE;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp3_ = TRUE;
+ _tmp2_ = TRUE;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
while (TRUE) {
-#line 1582 "DataImportJob.c"
- SpitDataImportsImportableTag* _tmp6_;
- GeeList* _tmp7_;
- SpitDataImportsImportableTag* _tmp8_;
+#line 1629 "DataImportJob.c"
+ SpitDataImportsImportableTag* _tmp5_;
+ GeeList* _tmp6_;
+ SpitDataImportsImportableTag* _tmp7_;
+ gchar* _tmp8_;
gchar* _tmp9_;
gchar* _tmp10_;
gchar* _tmp11_;
- gchar* _tmp12_;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (!_tmp3_) {
-#line 1592 "DataImportJob.c"
+ if (!_tmp2_) {
+#line 1639 "DataImportJob.c"
+ SpitDataImportsImportableTag* _tmp3_;
SpitDataImportsImportableTag* _tmp4_;
- SpitDataImportsImportableTag* _tmp5_;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp4_ = current_tag;
+ _tmp3_ = current_tag;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp5_ = spit_data_imports_importable_tag_get_parent (_tmp4_);
+ _tmp4_ = spit_data_imports_importable_tag_get_parent (_tmp3_);
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (current_tag);
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- current_tag = _tmp5_;
-#line 1603 "DataImportJob.c"
+ current_tag = _tmp4_;
+#line 1650 "DataImportJob.c"
}
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp3_ = FALSE;
+ _tmp2_ = FALSE;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp6_ = current_tag;
+ _tmp5_ = current_tag;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- if (!(_tmp6_ != NULL)) {
+ if (!(_tmp5_ != NULL)) {
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
break;
-#line 1613 "DataImportJob.c"
+#line 1660 "DataImportJob.c"
}
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp7_ = components;
+ _tmp6_ = components;
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp8_ = current_tag;
+ _tmp7_ = current_tag;
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp9_ = spit_data_imports_importable_tag_get_name (_tmp8_);
+ _tmp8_ = spit_data_imports_importable_tag_get_name (_tmp7_);
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp11_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp10_);
+ _tmp10_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp9_);
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- gee_list_insert (_tmp7_, 0, _tmp12_);
+ gee_list_insert (_tmp6_, 0, _tmp11_);
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _g_free0 (_tmp12_);
+ _g_free0 (_tmp11_);
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _g_free0 (_tmp10_);
-#line 1633 "DataImportJob.c"
+ _g_free0 (_tmp9_);
+#line 1680 "DataImportJob.c"
}
}
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (current_tag);
-#line 1638 "DataImportJob.c"
+#line 1685 "DataImportJob.c"
}
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp13_ = components;
+ _tmp12_ = components;
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp15_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp14_);
+ _tmp14_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp13_);
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- _tmp16__length1 = _tmp14_;
+ _tmp15__length1 = _tmp13_;
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (result_length1) {
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- *result_length1 = _tmp16__length1;
-#line 1652 "DataImportJob.c"
+ *result_length1 = _tmp15__length1;
+#line 1699 "DataImportJob.c"
}
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- result = _tmp16_;
+ result = _tmp15_;
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (components);
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 1660 "DataImportJob.c"
+#line 1707 "DataImportJob.c"
}
-static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImportJobClass * klass) {
+static void
+spit_data_imports_data_import_job_class_init (SpitDataImportsDataImportJobClass * klass)
+{
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
spit_data_imports_data_import_job_parent_class = g_type_class_peek_parent (klass);
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1685,22 +1734,26 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp
((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
-#line 1689 "DataImportJob.c"
+#line 1738 "DataImportJob.c"
}
-static void spit_data_imports_data_import_job_instance_init (SpitDataImportsDataImportJob * self) {
+static void
+spit_data_imports_data_import_job_instance_init (SpitDataImportsDataImportJob * self)
+{
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self->priv = SPIT_DATA_IMPORTS_DATA_IMPORT_JOB_GET_PRIVATE (self);
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self->priv->associated = NULL;
#line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self->priv->detected_htags = NULL;
-#line 1700 "DataImportJob.c"
+#line 1751 "DataImportJob.c"
}
-static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
+static void
+spit_data_imports_data_import_job_finalize (BatchImportJob * obj)
+{
SpitDataImportsDataImportJob * self;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
@@ -1714,14 +1767,16 @@ static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
_hierarchical_tag_index_unref0 (self->priv->detected_htags);
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
BATCH_IMPORT_JOB_CLASS (spit_data_imports_data_import_job_parent_class)->finalize (obj);
-#line 1718 "DataImportJob.c"
+#line 1771 "DataImportJob.c"
}
/**
* A specialized import job implementation for alien databases.
*/
-GType spit_data_imports_data_import_job_get_type (void) {
+GType
+spit_data_imports_data_import_job_get_type (void)
+{
static volatile gsize spit_data_imports_data_import_job_type_id__volatile = 0;
if (g_once_init_enter (&spit_data_imports_data_import_job_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsDataImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_data_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsDataImportJob), 0, (GInstanceInitFunc) spit_data_imports_data_import_job_instance_init, NULL };
@@ -1733,7 +1788,11 @@ GType spit_data_imports_data_import_job_get_type (void) {
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -1745,7 +1804,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}