summaryrefslogtreecommitdiff
path: root/src/BatchImport.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
commitdfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch)
treedee893916166ac1c8b479b74e7f341429945260e /src/BatchImport.c
parenta5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff)
parent9e7cd144725a270e0460b21747619f447ca87684 (diff)
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/BatchImport.c')
-rw-r--r--src/BatchImport.c2073
1 files changed, 1040 insertions, 1033 deletions
diff --git a/src/BatchImport.c b/src/BatchImport.c
index 5904344..382a63c 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -1,4 +1,4 @@
-/* BatchImport.c generated by valac 0.34.4, the Vala compiler
+/* BatchImport.c generated by valac 0.34.7, the Vala compiler
* generated from BatchImport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2961,11 +2961,12 @@ gchar* batch_import_job_get_source_identifier (BatchImportJob* self) {
static gboolean batch_import_job_real_is_directory (BatchImportJob* self) {
+ gboolean _tmp0_ = FALSE;
#line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_critical ("Type `%s' does not implement abstract method `batch_import_job_is_directory'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
- return FALSE;
-#line 2969 "BatchImport.c"
+ return _tmp0_;
+#line 2970 "BatchImport.c"
}
@@ -2974,7 +2975,7 @@ gboolean batch_import_job_is_directory (BatchImportJob* self) {
g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
#line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
return BATCH_IMPORT_JOB_GET_CLASS (self)->is_directory (self);
-#line 2978 "BatchImport.c"
+#line 2979 "BatchImport.c"
}
@@ -2983,7 +2984,7 @@ static gchar* batch_import_job_real_get_basename (BatchImportJob* self) {
g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_basename'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 2987 "BatchImport.c"
+#line 2988 "BatchImport.c"
}
@@ -2992,7 +2993,7 @@ gchar* batch_import_job_get_basename (BatchImportJob* self) {
g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
#line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
return BATCH_IMPORT_JOB_GET_CLASS (self)->get_basename (self);
-#line 2996 "BatchImport.c"
+#line 2997 "BatchImport.c"
}
@@ -3001,7 +3002,7 @@ static gchar* batch_import_job_real_get_path (BatchImportJob* self) {
g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_path'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 3005 "BatchImport.c"
+#line 3006 "BatchImport.c"
}
@@ -3010,7 +3011,7 @@ gchar* batch_import_job_get_path (BatchImportJob* self) {
g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
#line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
return BATCH_IMPORT_JOB_GET_CLASS (self)->get_path (self);
-#line 3014 "BatchImport.c"
+#line 3015 "BatchImport.c"
}
@@ -3020,7 +3021,7 @@ static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob
result = NULL;
#line 172 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3024 "BatchImport.c"
+#line 3025 "BatchImport.c"
}
@@ -3029,7 +3030,7 @@ DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self) {
g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
#line 171 "/home/jens/Source/shotwell/src/BatchImport.vala"
return BATCH_IMPORT_JOB_GET_CLASS (self)->get_duplicated_file (self);
-#line 3033 "BatchImport.c"
+#line 3034 "BatchImport.c"
}
@@ -3038,7 +3039,7 @@ static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImp
g_critical ("Type `%s' does not implement abstract method `batch_import_job_set_associated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 3042 "BatchImport.c"
+#line 3043 "BatchImport.c"
}
@@ -3047,16 +3048,17 @@ void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* asso
g_return_if_fail (IS_BATCH_IMPORT_JOB (self));
#line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
BATCH_IMPORT_JOB_GET_CLASS (self)->set_associated (self, associated);
-#line 3051 "BatchImport.c"
+#line 3052 "BatchImport.c"
}
static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile** file_or_dir) {
+ gboolean _tmp0_ = FALSE;
#line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_critical ("Type `%s' does not implement abstract method `batch_import_job_determine_file_size'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
- return FALSE;
-#line 3060 "BatchImport.c"
+ return _tmp0_;
+#line 3062 "BatchImport.c"
}
@@ -3065,16 +3067,17 @@ gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* fi
g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
#line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
return BATCH_IMPORT_JOB_GET_CLASS (self)->determine_file_size (self, filesize, file_or_dir);
-#line 3069 "BatchImport.c"
+#line 3071 "BatchImport.c"
}
static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error) {
+ gboolean _tmp0_ = FALSE;
#line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_critical ("Type `%s' does not implement abstract method `batch_import_job_prepare'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
- return FALSE;
-#line 3078 "BatchImport.c"
+ return _tmp0_;
+#line 3081 "BatchImport.c"
}
@@ -3083,7 +3086,7 @@ gboolean batch_import_job_prepare (BatchImportJob* self, GFile** file_to_import,
g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
#line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
return BATCH_IMPORT_JOB_GET_CLASS (self)->prepare (self, file_to_import, copy_to_library, error);
-#line 3087 "BatchImport.c"
+#line 3090 "BatchImport.c"
}
@@ -3097,7 +3100,7 @@ static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSourc
result = FALSE;
#line 197 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3101 "BatchImport.c"
+#line 3104 "BatchImport.c"
}
@@ -3106,7 +3109,7 @@ gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, B
g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
#line 196 "/home/jens/Source/shotwell/src/BatchImport.vala"
return BATCH_IMPORT_JOB_GET_CLASS (self)->complete (self, source, import_roll, error);
-#line 3110 "BatchImport.c"
+#line 3113 "BatchImport.c"
}
@@ -3116,7 +3119,7 @@ static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob*
result = (time_t) 0;
#line 203 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3120 "BatchImport.c"
+#line 3123 "BatchImport.c"
}
@@ -3125,7 +3128,7 @@ time_t batch_import_job_get_exposure_time_override (BatchImportJob* self) {
g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), 0);
#line 202 "/home/jens/Source/shotwell/src/BatchImport.vala"
return BATCH_IMPORT_JOB_GET_CLASS (self)->get_exposure_time_override (self);
-#line 3129 "BatchImport.c"
+#line 3132 "BatchImport.c"
}
@@ -3135,14 +3138,14 @@ BatchImportJob* batch_import_job_construct (GType object_type) {
self = (BatchImportJob*) g_type_create_instance (object_type);
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 3139 "BatchImport.c"
+#line 3142 "BatchImport.c"
}
static void value_batch_import_job_init (GValue* value) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 3146 "BatchImport.c"
+#line 3149 "BatchImport.c"
}
@@ -3151,7 +3154,7 @@ static void value_batch_import_job_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_job_unref (value->data[0].v_pointer);
-#line 3155 "BatchImport.c"
+#line 3158 "BatchImport.c"
}
}
@@ -3161,11 +3164,11 @@ static void value_batch_import_job_copy_value (const GValue* src_value, GValue*
if (src_value->data[0].v_pointer) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = batch_import_job_ref (src_value->data[0].v_pointer);
-#line 3165 "BatchImport.c"
+#line 3168 "BatchImport.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3169 "BatchImport.c"
+#line 3172 "BatchImport.c"
}
}
@@ -3173,37 +3176,37 @@ static void value_batch_import_job_copy_value (const GValue* src_value, GValue*
static gpointer value_batch_import_job_peek_pointer (const GValue* value) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 3177 "BatchImport.c"
+#line 3180 "BatchImport.c"
}
static gchar* value_batch_import_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (collect_values[0].v_pointer) {
-#line 3184 "BatchImport.c"
+#line 3187 "BatchImport.c"
BatchImportJob* object;
object = collect_values[0].v_pointer;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (object->parent_instance.g_class == NULL) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3191 "BatchImport.c"
+#line 3194 "BatchImport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.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 3195 "BatchImport.c"
+#line 3198 "BatchImport.c"
}
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = batch_import_job_ref (object);
-#line 3199 "BatchImport.c"
+#line 3202 "BatchImport.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 3203 "BatchImport.c"
+#line 3206 "BatchImport.c"
}
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 3207 "BatchImport.c"
+#line 3210 "BatchImport.c"
}
@@ -3214,25 +3217,25 @@ static gchar* value_batch_import_job_lcopy_value (const GValue* value, guint n_c
if (!object_p) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3218 "BatchImport.c"
+#line 3221 "BatchImport.c"
}
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!value->data[0].v_pointer) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = NULL;
-#line 3224 "BatchImport.c"
+#line 3227 "BatchImport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = value->data[0].v_pointer;
-#line 3228 "BatchImport.c"
+#line 3231 "BatchImport.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = batch_import_job_ref (value->data[0].v_pointer);
-#line 3232 "BatchImport.c"
+#line 3235 "BatchImport.c"
}
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 3236 "BatchImport.c"
+#line 3239 "BatchImport.c"
}
@@ -3246,7 +3249,7 @@ GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, c
G_PARAM_SPEC (spec)->value_type = object_type;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
return G_PARAM_SPEC (spec);
-#line 3250 "BatchImport.c"
+#line 3253 "BatchImport.c"
}
@@ -3255,7 +3258,7 @@ gpointer value_get_batch_import_job (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB), NULL);
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 3259 "BatchImport.c"
+#line 3262 "BatchImport.c"
}
@@ -3275,17 +3278,17 @@ void value_set_batch_import_job (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_job_ref (value->data[0].v_pointer);
-#line 3279 "BatchImport.c"
+#line 3282 "BatchImport.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 3283 "BatchImport.c"
+#line 3286 "BatchImport.c"
}
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_job_unref (old);
-#line 3289 "BatchImport.c"
+#line 3292 "BatchImport.c"
}
}
@@ -3304,17 +3307,17 @@ void value_take_batch_import_job (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = v_object;
-#line 3308 "BatchImport.c"
+#line 3311 "BatchImport.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 3312 "BatchImport.c"
+#line 3315 "BatchImport.c"
}
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_job_unref (old);
-#line 3318 "BatchImport.c"
+#line 3321 "BatchImport.c"
}
}
@@ -3325,35 +3328,35 @@ static void batch_import_job_class_init (BatchImportJobClass * klass) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
((BatchImportJobClass *) klass)->finalize = batch_import_job_finalize;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_dest_identifier = batch_import_job_real_get_dest_identifier;
+ ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_dest_identifier;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_source_identifier = batch_import_job_real_get_source_identifier;
+ ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_source_identifier;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->is_directory = batch_import_job_real_is_directory;
+ ((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) batch_import_job_real_is_directory;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_basename = batch_import_job_real_get_basename;
+ ((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_basename;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_path = batch_import_job_real_get_path;
+ ((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_path;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_duplicated_file = batch_import_job_real_get_duplicated_file;
+ ((BatchImportJobClass *) klass)->get_duplicated_file = (DuplicatedFile* (*)(BatchImportJob*)) batch_import_job_real_get_duplicated_file;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->set_associated = batch_import_job_real_set_associated;
+ ((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) batch_import_job_real_set_associated;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->determine_file_size = batch_import_job_real_determine_file_size;
+ ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) batch_import_job_real_determine_file_size;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->prepare = batch_import_job_real_prepare;
+ ((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) batch_import_job_real_prepare;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->complete = batch_import_job_real_complete;
+ ((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) batch_import_job_real_complete;
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_exposure_time_override = batch_import_job_real_get_exposure_time_override;
-#line 3350 "BatchImport.c"
+ ((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*)(BatchImportJob*)) batch_import_job_real_get_exposure_time_override;
+#line 3353 "BatchImport.c"
}
static void batch_import_job_instance_init (BatchImportJob * self) {
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->ref_count = 1;
-#line 3357 "BatchImport.c"
+#line 3360 "BatchImport.c"
}
@@ -3363,7 +3366,7 @@ static void batch_import_job_finalize (BatchImportJob* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_JOB, BatchImportJob);
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_signal_handlers_destroy (self);
-#line 3367 "BatchImport.c"
+#line 3370 "BatchImport.c"
}
@@ -3388,7 +3391,7 @@ gpointer batch_import_job_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
return instance;
-#line 3392 "BatchImport.c"
+#line 3395 "BatchImport.c"
}
@@ -3401,7 +3404,7 @@ void batch_import_job_unref (gpointer instance) {
BATCH_IMPORT_JOB_GET_CLASS (self)->finalize (self);
#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3405 "BatchImport.c"
+#line 3408 "BatchImport.c"
}
}
@@ -3409,7 +3412,7 @@ void batch_import_job_unref (gpointer instance) {
static gpointer _g_object_ref0 (gpointer self) {
#line 213 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? g_object_ref (self) : NULL;
-#line 3413 "BatchImport.c"
+#line 3416 "BatchImport.c"
}
@@ -3436,14 +3439,14 @@ FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir,
self->priv->copy_to_library = _tmp2_;
#line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 3440 "BatchImport.c"
+#line 3443 "BatchImport.c"
}
FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library) {
#line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
return file_import_job_construct (TYPE_FILE_IMPORT_JOB, file_or_dir, copy_to_library);
-#line 3447 "BatchImport.c"
+#line 3450 "BatchImport.c"
}
@@ -3462,7 +3465,7 @@ static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) {
result = _tmp1_;
#line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3466 "BatchImport.c"
+#line 3469 "BatchImport.c"
}
@@ -3481,7 +3484,7 @@ static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base)
result = _tmp1_;
#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3485 "BatchImport.c"
+#line 3488 "BatchImport.c"
}
@@ -3500,7 +3503,7 @@ static gboolean file_import_job_real_is_directory (BatchImportJob* base) {
result = _tmp1_;
#line 226 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3504 "BatchImport.c"
+#line 3507 "BatchImport.c"
}
@@ -3519,7 +3522,7 @@ static gchar* file_import_job_real_get_basename (BatchImportJob* base) {
result = _tmp1_;
#line 230 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3523 "BatchImport.c"
+#line 3526 "BatchImport.c"
}
@@ -3534,7 +3537,7 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) {
_tmp1_ = batch_import_job_is_directory (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_) {
-#line 3538 "BatchImport.c"
+#line 3541 "BatchImport.c"
GFile* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3545,7 +3548,7 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) {
_g_free0 (_tmp0_);
#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp3_;
-#line 3549 "BatchImport.c"
+#line 3552 "BatchImport.c"
} else {
GFile* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
@@ -3565,20 +3568,20 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) {
_tmp0_ = _tmp7_;
#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_tmp6_);
-#line 3569 "BatchImport.c"
+#line 3572 "BatchImport.c"
}
#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = _tmp0_;
#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3575 "BatchImport.c"
+#line 3578 "BatchImport.c"
}
static gpointer _batch_import_job_ref0 (gpointer self) {
#line 238 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? batch_import_job_ref (self) : NULL;
-#line 3582 "BatchImport.c"
+#line 3585 "BatchImport.c"
}
@@ -3598,7 +3601,7 @@ static void file_import_job_real_set_associated (BatchImportJob* base, BatchImpo
_batch_import_job_unref0 (self->priv->associated);
#line 238 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->associated = _tmp1_;
-#line 3602 "BatchImport.c"
+#line 3605 "BatchImport.c"
}
@@ -3627,21 +3630,21 @@ static gboolean file_import_job_real_determine_file_size (BatchImportJob* base,
if (filesize) {
#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
*filesize = _vala_filesize;
-#line 3631 "BatchImport.c"
+#line 3634 "BatchImport.c"
}
#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (file) {
#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
*file = _vala_file;
-#line 3637 "BatchImport.c"
+#line 3640 "BatchImport.c"
} else {
#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_vala_file);
-#line 3641 "BatchImport.c"
+#line 3644 "BatchImport.c"
}
#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3645 "BatchImport.c"
+#line 3648 "BatchImport.c"
}
@@ -3673,21 +3676,21 @@ static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile** file
if (file_to_import) {
#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
*file_to_import = _vala_file_to_import;
-#line 3677 "BatchImport.c"
+#line 3680 "BatchImport.c"
} else {
#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 3681 "BatchImport.c"
+#line 3684 "BatchImport.c"
}
#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (copy) {
#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
*copy = _vala_copy;
-#line 3687 "BatchImport.c"
+#line 3690 "BatchImport.c"
}
#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3691 "BatchImport.c"
+#line 3694 "BatchImport.c"
}
@@ -3705,7 +3708,7 @@ GFile* file_import_job_get_file (FileImportJob* self) {
result = _tmp1_;
#line 256 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 3709 "BatchImport.c"
+#line 3712 "BatchImport.c"
}
@@ -3717,22 +3720,22 @@ static void file_import_job_class_init (FileImportJobClass * klass) {
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_class_add_private (klass, sizeof (FileImportJobPrivate));
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_dest_identifier = file_import_job_real_get_dest_identifier;
+ ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_dest_identifier;
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_source_identifier = file_import_job_real_get_source_identifier;
+ ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_source_identifier;
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->is_directory = file_import_job_real_is_directory;
+ ((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) file_import_job_real_is_directory;
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_basename = file_import_job_real_get_basename;
+ ((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_basename;
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->get_path = file_import_job_real_get_path;
+ ((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_path;
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->set_associated = file_import_job_real_set_associated;
+ ((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) file_import_job_real_set_associated;
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->determine_file_size = file_import_job_real_determine_file_size;
+ ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) file_import_job_real_determine_file_size;
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BatchImportJobClass *) klass)->prepare = file_import_job_real_prepare;
-#line 3736 "BatchImport.c"
+ ((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) file_import_job_real_prepare;
+#line 3739 "BatchImport.c"
}
@@ -3741,7 +3744,7 @@ static void file_import_job_instance_init (FileImportJob * self) {
self->priv = FILE_IMPORT_JOB_GET_PRIVATE (self);
#line 210 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->associated = NULL;
-#line 3745 "BatchImport.c"
+#line 3748 "BatchImport.c"
}
@@ -3755,7 +3758,7 @@ static void file_import_job_finalize (BatchImportJob* obj) {
_batch_import_job_unref0 (self->priv->associated);
#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
BATCH_IMPORT_JOB_CLASS (file_import_job_parent_class)->finalize (obj);
-#line 3759 "BatchImport.c"
+#line 3762 "BatchImport.c"
}
@@ -3782,21 +3785,21 @@ BatchImportRoll* batch_import_roll_construct (GType object_type) {
self->import_id = _tmp0_;
#line 267 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 3786 "BatchImport.c"
+#line 3789 "BatchImport.c"
}
BatchImportRoll* batch_import_roll_new (void) {
#line 267 "/home/jens/Source/shotwell/src/BatchImport.vala"
return batch_import_roll_construct (TYPE_BATCH_IMPORT_ROLL);
-#line 3793 "BatchImport.c"
+#line 3796 "BatchImport.c"
}
static void value_batch_import_roll_init (GValue* value) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 3800 "BatchImport.c"
+#line 3803 "BatchImport.c"
}
@@ -3805,7 +3808,7 @@ static void value_batch_import_roll_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_roll_unref (value->data[0].v_pointer);
-#line 3809 "BatchImport.c"
+#line 3812 "BatchImport.c"
}
}
@@ -3815,11 +3818,11 @@ static void value_batch_import_roll_copy_value (const GValue* src_value, GValue*
if (src_value->data[0].v_pointer) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = batch_import_roll_ref (src_value->data[0].v_pointer);
-#line 3819 "BatchImport.c"
+#line 3822 "BatchImport.c"
} else {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3823 "BatchImport.c"
+#line 3826 "BatchImport.c"
}
}
@@ -3827,37 +3830,37 @@ static void value_batch_import_roll_copy_value (const GValue* src_value, GValue*
static gpointer value_batch_import_roll_peek_pointer (const GValue* value) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 3831 "BatchImport.c"
+#line 3834 "BatchImport.c"
}
static gchar* value_batch_import_roll_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (collect_values[0].v_pointer) {
-#line 3838 "BatchImport.c"
+#line 3841 "BatchImport.c"
BatchImportRoll* object;
object = collect_values[0].v_pointer;
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (object->parent_instance.g_class == NULL) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3845 "BatchImport.c"
+#line 3848 "BatchImport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.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 3849 "BatchImport.c"
+#line 3852 "BatchImport.c"
}
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = batch_import_roll_ref (object);
-#line 3853 "BatchImport.c"
+#line 3856 "BatchImport.c"
} else {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 3857 "BatchImport.c"
+#line 3860 "BatchImport.c"
}
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 3861 "BatchImport.c"
+#line 3864 "BatchImport.c"
}
@@ -3868,25 +3871,25 @@ static gchar* value_batch_import_roll_lcopy_value (const GValue* value, guint n_
if (!object_p) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3872 "BatchImport.c"
+#line 3875 "BatchImport.c"
}
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!value->data[0].v_pointer) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = NULL;
-#line 3878 "BatchImport.c"
+#line 3881 "BatchImport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = value->data[0].v_pointer;
-#line 3882 "BatchImport.c"
+#line 3885 "BatchImport.c"
} else {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = batch_import_roll_ref (value->data[0].v_pointer);
-#line 3886 "BatchImport.c"
+#line 3889 "BatchImport.c"
}
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 3890 "BatchImport.c"
+#line 3893 "BatchImport.c"
}
@@ -3900,7 +3903,7 @@ GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
return G_PARAM_SPEC (spec);
-#line 3904 "BatchImport.c"
+#line 3907 "BatchImport.c"
}
@@ -3909,7 +3912,7 @@ gpointer value_get_batch_import_roll (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL), NULL);
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 3913 "BatchImport.c"
+#line 3916 "BatchImport.c"
}
@@ -3929,17 +3932,17 @@ void value_set_batch_import_roll (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_roll_ref (value->data[0].v_pointer);
-#line 3933 "BatchImport.c"
+#line 3936 "BatchImport.c"
} else {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 3937 "BatchImport.c"
+#line 3940 "BatchImport.c"
}
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_roll_unref (old);
-#line 3943 "BatchImport.c"
+#line 3946 "BatchImport.c"
}
}
@@ -3958,17 +3961,17 @@ void value_take_batch_import_roll (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = v_object;
-#line 3962 "BatchImport.c"
+#line 3965 "BatchImport.c"
} else {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 3966 "BatchImport.c"
+#line 3969 "BatchImport.c"
}
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_roll_unref (old);
-#line 3972 "BatchImport.c"
+#line 3975 "BatchImport.c"
}
}
@@ -3978,7 +3981,7 @@ static void batch_import_roll_class_init (BatchImportRollClass * klass) {
batch_import_roll_parent_class = g_type_class_peek_parent (klass);
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
((BatchImportRollClass *) klass)->finalize = batch_import_roll_finalize;
-#line 3982 "BatchImport.c"
+#line 3985 "BatchImport.c"
}
@@ -3990,7 +3993,7 @@ static void batch_import_roll_instance_init (BatchImportRoll * self) {
self->generated_events = _tmp0_;
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->ref_count = 1;
-#line 3994 "BatchImport.c"
+#line 3997 "BatchImport.c"
}
@@ -4002,7 +4005,7 @@ static void batch_import_roll_finalize (BatchImportRoll* obj) {
g_signal_handlers_destroy (self);
#line 265 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_collection_unref0 (self->generated_events);
-#line 4006 "BatchImport.c"
+#line 4009 "BatchImport.c"
}
@@ -4027,7 +4030,7 @@ gpointer batch_import_roll_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
return instance;
-#line 4031 "BatchImport.c"
+#line 4034 "BatchImport.c"
}
@@ -4040,7 +4043,7 @@ void batch_import_roll_unref (gpointer instance) {
BATCH_IMPORT_ROLL_GET_CLASS (self)->finalize (self);
#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4044 "BatchImport.c"
+#line 4047 "BatchImport.c"
}
}
@@ -4116,14 +4119,14 @@ BatchImportResult* batch_import_result_construct (GType object_type, BatchImport
self->result = _tmp10_;
#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 4120 "BatchImport.c"
+#line 4123 "BatchImport.c"
}
BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) {
#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
return batch_import_result_construct (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, duplicate_of, _result_);
-#line 4127 "BatchImport.c"
+#line 4130 "BatchImport.c"
}
@@ -4205,21 +4208,21 @@ BatchImportResult* batch_import_result_construct_from_error (GType object_type,
self->errmsg = _tmp13_;
#line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 4209 "BatchImport.c"
+#line 4212 "BatchImport.c"
}
BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) {
#line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
return batch_import_result_construct_from_error (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, err, default_result);
-#line 4216 "BatchImport.c"
+#line 4219 "BatchImport.c"
}
static void value_batch_import_result_init (GValue* value) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 4223 "BatchImport.c"
+#line 4226 "BatchImport.c"
}
@@ -4228,7 +4231,7 @@ static void value_batch_import_result_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_result_unref (value->data[0].v_pointer);
-#line 4232 "BatchImport.c"
+#line 4235 "BatchImport.c"
}
}
@@ -4238,11 +4241,11 @@ static void value_batch_import_result_copy_value (const GValue* src_value, GValu
if (src_value->data[0].v_pointer) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = batch_import_result_ref (src_value->data[0].v_pointer);
-#line 4242 "BatchImport.c"
+#line 4245 "BatchImport.c"
} else {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4246 "BatchImport.c"
+#line 4249 "BatchImport.c"
}
}
@@ -4250,37 +4253,37 @@ static void value_batch_import_result_copy_value (const GValue* src_value, GValu
static gpointer value_batch_import_result_peek_pointer (const GValue* value) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 4254 "BatchImport.c"
+#line 4257 "BatchImport.c"
}
static gchar* value_batch_import_result_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (collect_values[0].v_pointer) {
-#line 4261 "BatchImport.c"
+#line 4264 "BatchImport.c"
BatchImportResult* object;
object = collect_values[0].v_pointer;
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (object->parent_instance.g_class == NULL) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4268 "BatchImport.c"
+#line 4271 "BatchImport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.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 4272 "BatchImport.c"
+#line 4275 "BatchImport.c"
}
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = batch_import_result_ref (object);
-#line 4276 "BatchImport.c"
+#line 4279 "BatchImport.c"
} else {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 4280 "BatchImport.c"
+#line 4283 "BatchImport.c"
}
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 4284 "BatchImport.c"
+#line 4287 "BatchImport.c"
}
@@ -4291,25 +4294,25 @@ static gchar* value_batch_import_result_lcopy_value (const GValue* value, guint
if (!object_p) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4295 "BatchImport.c"
+#line 4298 "BatchImport.c"
}
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!value->data[0].v_pointer) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = NULL;
-#line 4301 "BatchImport.c"
+#line 4304 "BatchImport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = value->data[0].v_pointer;
-#line 4305 "BatchImport.c"
+#line 4308 "BatchImport.c"
} else {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = batch_import_result_ref (value->data[0].v_pointer);
-#line 4309 "BatchImport.c"
+#line 4312 "BatchImport.c"
}
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 4313 "BatchImport.c"
+#line 4316 "BatchImport.c"
}
@@ -4323,7 +4326,7 @@ GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick
G_PARAM_SPEC (spec)->value_type = object_type;
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
return G_PARAM_SPEC (spec);
-#line 4327 "BatchImport.c"
+#line 4330 "BatchImport.c"
}
@@ -4332,7 +4335,7 @@ gpointer value_get_batch_import_result (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT), NULL);
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 4336 "BatchImport.c"
+#line 4339 "BatchImport.c"
}
@@ -4352,17 +4355,17 @@ void value_set_batch_import_result (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_result_ref (value->data[0].v_pointer);
-#line 4356 "BatchImport.c"
+#line 4359 "BatchImport.c"
} else {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 4360 "BatchImport.c"
+#line 4363 "BatchImport.c"
}
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_result_unref (old);
-#line 4366 "BatchImport.c"
+#line 4369 "BatchImport.c"
}
}
@@ -4381,17 +4384,17 @@ void value_take_batch_import_result (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = v_object;
-#line 4385 "BatchImport.c"
+#line 4388 "BatchImport.c"
} else {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 4389 "BatchImport.c"
+#line 4392 "BatchImport.c"
}
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_result_unref (old);
-#line 4395 "BatchImport.c"
+#line 4398 "BatchImport.c"
}
}
@@ -4401,7 +4404,7 @@ static void batch_import_result_class_init (BatchImportResultClass * klass) {
batch_import_result_parent_class = g_type_class_peek_parent (klass);
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
((BatchImportResultClass *) klass)->finalize = batch_import_result_finalize;
-#line 4405 "BatchImport.c"
+#line 4408 "BatchImport.c"
}
@@ -4410,7 +4413,7 @@ static void batch_import_result_instance_init (BatchImportResult * self) {
self->errmsg = NULL;
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->ref_count = 1;
-#line 4414 "BatchImport.c"
+#line 4417 "BatchImport.c"
}
@@ -4432,7 +4435,7 @@ static void batch_import_result_finalize (BatchImportResult* obj) {
_g_free0 (self->errmsg);
#line 285 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (self->duplicate_of);
-#line 4436 "BatchImport.c"
+#line 4439 "BatchImport.c"
}
@@ -4457,7 +4460,7 @@ gpointer batch_import_result_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
return instance;
-#line 4461 "BatchImport.c"
+#line 4464 "BatchImport.c"
}
@@ -4470,7 +4473,7 @@ void batch_import_result_unref (gpointer instance) {
BATCH_IMPORT_RESULT_GET_CLASS (self)->finalize (self);
#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4474 "BatchImport.c"
+#line 4477 "BatchImport.c"
}
}
@@ -4489,7 +4492,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
_tmp0_ = prefailed;
#line 323 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp0_ != NULL) {
-#line 4493 "BatchImport.c"
+#line 4496 "BatchImport.c"
{
GeeList* _job_list = NULL;
GeeList* _tmp1_ = NULL;
@@ -4517,7 +4520,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
_job_index = -1;
#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 4521 "BatchImport.c"
+#line 4524 "BatchImport.c"
gint _tmp6_ = 0;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
@@ -4548,7 +4551,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
if (!(_tmp7_ < _tmp8_)) {
#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4552 "BatchImport.c"
+#line 4555 "BatchImport.c"
}
#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp9_ = _job_list;
@@ -4590,18 +4593,18 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
_batch_import_result_unref0 (batch_result);
#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
_batch_import_job_unref0 (job);
-#line 4594 "BatchImport.c"
+#line 4597 "BatchImport.c"
}
#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_job_list);
-#line 4598 "BatchImport.c"
+#line 4601 "BatchImport.c"
}
}
#line 333 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp22_ = pre_already_imported;
#line 333 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp22_ != NULL) {
-#line 4605 "BatchImport.c"
+#line 4608 "BatchImport.c"
{
GeeList* _job_list = NULL;
GeeList* _tmp23_ = NULL;
@@ -4629,7 +4632,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
_job_index = -1;
#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 4633 "BatchImport.c"
+#line 4636 "BatchImport.c"
gint _tmp28_ = 0;
gint _tmp29_ = 0;
gint _tmp30_ = 0;
@@ -4668,7 +4671,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
if (!(_tmp29_ < _tmp30_)) {
#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4672 "BatchImport.c"
+#line 4675 "BatchImport.c"
}
#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp31_ = _job_list;
@@ -4732,23 +4735,23 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
_batch_import_result_unref0 (batch_result);
#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
_batch_import_job_unref0 (job);
-#line 4736 "BatchImport.c"
+#line 4739 "BatchImport.c"
}
#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_job_list);
-#line 4740 "BatchImport.c"
+#line 4743 "BatchImport.c"
}
}
#line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 4745 "BatchImport.c"
+#line 4748 "BatchImport.c"
}
ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported) {
#line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
return import_manifest_construct (TYPE_IMPORT_MANIFEST, prefailed, pre_already_imported);
-#line 4752 "BatchImport.c"
+#line 4755 "BatchImport.c"
}
@@ -4771,7 +4774,7 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
switch (_tmp1_) {
#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
case IMPORT_RESULT_SUCCESS:
-#line 4775 "BatchImport.c"
+#line 4778 "BatchImport.c"
{
GeeList* _tmp2_ = NULL;
BatchImportResult* _tmp3_ = NULL;
@@ -4783,11 +4786,11 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_);
#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4787 "BatchImport.c"
+#line 4790 "BatchImport.c"
}
#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
case IMPORT_RESULT_USER_ABORT:
-#line 4791 "BatchImport.c"
+#line 4794 "BatchImport.c"
{
gboolean _tmp4_ = FALSE;
BatchImportResult* _tmp5_ = NULL;
@@ -4798,7 +4801,7 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
_tmp6_ = _tmp5_->file;
#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp6_ != NULL) {
-#line 4802 "BatchImport.c"
+#line 4805 "BatchImport.c"
BatchImportResult* _tmp7_ = NULL;
GFile* _tmp8_ = NULL;
gboolean _tmp9_ = FALSE;
@@ -4810,15 +4813,15 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
_tmp9_ = query_is_directory (_tmp8_);
#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp4_ = !_tmp9_;
-#line 4814 "BatchImport.c"
+#line 4817 "BatchImport.c"
} else {
#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp4_ = FALSE;
-#line 4818 "BatchImport.c"
+#line 4821 "BatchImport.c"
}
#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp4_) {
-#line 4822 "BatchImport.c"
+#line 4825 "BatchImport.c"
GeeList* _tmp10_ = NULL;
BatchImportResult* _tmp11_ = NULL;
#line 354 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4827,19 +4830,19 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
_tmp11_ = batch_result;
#line 354 "/home/jens/Source/shotwell/src/BatchImport.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
-#line 4831 "BatchImport.c"
+#line 4834 "BatchImport.c"
} else {
#line 356 "/home/jens/Source/shotwell/src/BatchImport.vala"
reported = FALSE;
-#line 4835 "BatchImport.c"
+#line 4838 "BatchImport.c"
}
#line 357 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4839 "BatchImport.c"
+#line 4842 "BatchImport.c"
}
#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
case IMPORT_RESULT_UNSUPPORTED_FORMAT:
-#line 4843 "BatchImport.c"
+#line 4846 "BatchImport.c"
{
GeeList* _tmp12_ = NULL;
BatchImportResult* _tmp13_ = NULL;
@@ -4851,13 +4854,13 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_);
#line 361 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4855 "BatchImport.c"
+#line 4858 "BatchImport.c"
}
#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
case IMPORT_RESULT_NOT_A_FILE:
#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
case IMPORT_RESULT_NOT_AN_IMAGE:
-#line 4861 "BatchImport.c"
+#line 4864 "BatchImport.c"
{
GeeList* _tmp14_ = NULL;
BatchImportResult* _tmp15_ = NULL;
@@ -4869,11 +4872,11 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
#line 366 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4873 "BatchImport.c"
+#line 4876 "BatchImport.c"
}
#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
case IMPORT_RESULT_PHOTO_EXISTS:
-#line 4877 "BatchImport.c"
+#line 4880 "BatchImport.c"
{
GeeList* _tmp16_ = NULL;
BatchImportResult* _tmp17_ = NULL;
@@ -4885,11 +4888,11 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_);
#line 370 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4889 "BatchImport.c"
+#line 4892 "BatchImport.c"
}
#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
case IMPORT_RESULT_CAMERA_ERROR:
-#line 4893 "BatchImport.c"
+#line 4896 "BatchImport.c"
{
GeeList* _tmp18_ = NULL;
BatchImportResult* _tmp19_ = NULL;
@@ -4901,11 +4904,11 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
#line 374 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4905 "BatchImport.c"
+#line 4908 "BatchImport.c"
}
#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
case IMPORT_RESULT_FILE_WRITE_ERROR:
-#line 4909 "BatchImport.c"
+#line 4912 "BatchImport.c"
{
GeeList* _tmp20_ = NULL;
BatchImportResult* _tmp21_ = NULL;
@@ -4917,11 +4920,11 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
#line 378 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4921 "BatchImport.c"
+#line 4924 "BatchImport.c"
}
#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE:
-#line 4925 "BatchImport.c"
+#line 4928 "BatchImport.c"
{
GeeList* _tmp22_ = NULL;
BatchImportResult* _tmp23_ = NULL;
@@ -4933,7 +4936,7 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
#line 382 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4937 "BatchImport.c"
+#line 4940 "BatchImport.c"
}
default:
{
@@ -4947,14 +4950,14 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
#line 386 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 4951 "BatchImport.c"
+#line 4954 "BatchImport.c"
}
}
#line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp26_ = reported;
#line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp26_) {
-#line 4958 "BatchImport.c"
+#line 4961 "BatchImport.c"
GeeList* _tmp27_ = NULL;
BatchImportResult* _tmp28_ = NULL;
#line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4963,7 +4966,7 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
_tmp28_ = batch_result;
#line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_);
-#line 4967 "BatchImport.c"
+#line 4970 "BatchImport.c"
}
}
@@ -4971,7 +4974,7 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
static void value_import_manifest_init (GValue* value) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 4975 "BatchImport.c"
+#line 4978 "BatchImport.c"
}
@@ -4980,7 +4983,7 @@ static void value_import_manifest_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
import_manifest_unref (value->data[0].v_pointer);
-#line 4984 "BatchImport.c"
+#line 4987 "BatchImport.c"
}
}
@@ -4990,11 +4993,11 @@ static void value_import_manifest_copy_value (const GValue* src_value, GValue* d
if (src_value->data[0].v_pointer) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = import_manifest_ref (src_value->data[0].v_pointer);
-#line 4994 "BatchImport.c"
+#line 4997 "BatchImport.c"
} else {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4998 "BatchImport.c"
+#line 5001 "BatchImport.c"
}
}
@@ -5002,37 +5005,37 @@ static void value_import_manifest_copy_value (const GValue* src_value, GValue* d
static gpointer value_import_manifest_peek_pointer (const GValue* value) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 5006 "BatchImport.c"
+#line 5009 "BatchImport.c"
}
static gchar* value_import_manifest_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (collect_values[0].v_pointer) {
-#line 5013 "BatchImport.c"
+#line 5016 "BatchImport.c"
ImportManifest* object;
object = collect_values[0].v_pointer;
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (object->parent_instance.g_class == NULL) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5020 "BatchImport.c"
+#line 5023 "BatchImport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.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 5024 "BatchImport.c"
+#line 5027 "BatchImport.c"
}
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = import_manifest_ref (object);
-#line 5028 "BatchImport.c"
+#line 5031 "BatchImport.c"
} else {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 5032 "BatchImport.c"
+#line 5035 "BatchImport.c"
}
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 5036 "BatchImport.c"
+#line 5039 "BatchImport.c"
}
@@ -5043,25 +5046,25 @@ static gchar* value_import_manifest_lcopy_value (const GValue* value, guint n_co
if (!object_p) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5047 "BatchImport.c"
+#line 5050 "BatchImport.c"
}
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!value->data[0].v_pointer) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = NULL;
-#line 5053 "BatchImport.c"
+#line 5056 "BatchImport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = value->data[0].v_pointer;
-#line 5057 "BatchImport.c"
+#line 5060 "BatchImport.c"
} else {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = import_manifest_ref (value->data[0].v_pointer);
-#line 5061 "BatchImport.c"
+#line 5064 "BatchImport.c"
}
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 5065 "BatchImport.c"
+#line 5068 "BatchImport.c"
}
@@ -5075,7 +5078,7 @@ GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, co
G_PARAM_SPEC (spec)->value_type = object_type;
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
return G_PARAM_SPEC (spec);
-#line 5079 "BatchImport.c"
+#line 5082 "BatchImport.c"
}
@@ -5084,7 +5087,7 @@ gpointer value_get_import_manifest (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST), NULL);
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 5088 "BatchImport.c"
+#line 5091 "BatchImport.c"
}
@@ -5104,17 +5107,17 @@ void value_set_import_manifest (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
import_manifest_ref (value->data[0].v_pointer);
-#line 5108 "BatchImport.c"
+#line 5111 "BatchImport.c"
} else {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 5112 "BatchImport.c"
+#line 5115 "BatchImport.c"
}
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
import_manifest_unref (old);
-#line 5118 "BatchImport.c"
+#line 5121 "BatchImport.c"
}
}
@@ -5133,17 +5136,17 @@ void value_take_import_manifest (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = v_object;
-#line 5137 "BatchImport.c"
+#line 5140 "BatchImport.c"
} else {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 5141 "BatchImport.c"
+#line 5144 "BatchImport.c"
}
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
import_manifest_unref (old);
-#line 5147 "BatchImport.c"
+#line 5150 "BatchImport.c"
}
}
@@ -5153,7 +5156,7 @@ static void import_manifest_class_init (ImportManifestClass * klass) {
import_manifest_parent_class = g_type_class_peek_parent (klass);
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
((ImportManifestClass *) klass)->finalize = import_manifest_finalize;
-#line 5157 "BatchImport.c"
+#line 5160 "BatchImport.c"
}
@@ -5170,52 +5173,52 @@ static void import_manifest_instance_init (ImportManifest * self) {
GeeArrayList* _tmp9_ = NULL;
GeeArrayList* _tmp10_ = NULL;
#line 309 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 309 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->imported = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
#line 310 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp1_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp1_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 310 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->success = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp2_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp2_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->camera_failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
#line 312 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp3_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp3_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 312 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList);
#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp4_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp4_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->write_failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp5_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp5_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->skipped_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->skipped_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp7_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp7_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->aborted = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp8_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp8_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->already_imported = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList);
#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp9_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp9_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->corrupt_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_LIST, GeeList);
#line 319 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp10_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp10_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 319 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->all = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_LIST, GeeList);
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->ref_count = 1;
-#line 5219 "BatchImport.c"
+#line 5222 "BatchImport.c"
}
@@ -5247,7 +5250,7 @@ static void import_manifest_finalize (ImportManifest* obj) {
_g_object_unref0 (self->corrupt_files);
#line 319 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (self->all);
-#line 5251 "BatchImport.c"
+#line 5254 "BatchImport.c"
}
@@ -5272,7 +5275,7 @@ gpointer import_manifest_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
return instance;
-#line 5276 "BatchImport.c"
+#line 5279 "BatchImport.c"
}
@@ -5285,7 +5288,7 @@ void import_manifest_unref (gpointer instance) {
IMPORT_MANIFEST_GET_CLASS (self)->finalize (self);
#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5289 "BatchImport.c"
+#line 5292 "BatchImport.c"
}
}
@@ -5293,14 +5296,14 @@ void import_manifest_unref (gpointer instance) {
static void _batch_import_user_halt_application_exiting (Application* _sender, gboolean panicked, gpointer self) {
#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_user_halt ((BatchImport*) self);
-#line 5297 "BatchImport.c"
+#line 5300 "BatchImport.c"
}
static gpointer _batch_import_roll_ref0 (gpointer self) {
#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? batch_import_roll_ref (self) : NULL;
-#line 5304 "BatchImport.c"
+#line 5307 "BatchImport.c"
}
@@ -5309,7 +5312,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
result = file_hash ((GFile*) v);
#line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 5313 "BatchImport.c"
+#line 5316 "BatchImport.c"
}
@@ -5318,7 +5321,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
result = file_equal ((GFile*) a, (GFile*) b);
#line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 5322 "BatchImport.c"
+#line 5325 "BatchImport.c"
}
@@ -5327,7 +5330,7 @@ static gboolean _batch_import_display_imported_timer_gsource_func (gpointer self
result = batch_import_display_imported_timer ((BatchImport*) self);
#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 5331 "BatchImport.c"
+#line 5334 "BatchImport.c"
}
@@ -5405,7 +5408,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_tmp9_ = cancellable;
#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp9_ != NULL) {
-#line 5409 "BatchImport.c"
+#line 5412 "BatchImport.c"
GCancellable* _tmp10_ = NULL;
GCancellable* _tmp11_ = NULL;
#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5416,7 +5419,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_g_object_unref0 (_tmp8_);
#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp8_ = _tmp11_;
-#line 5420 "BatchImport.c"
+#line 5423 "BatchImport.c"
} else {
GCancellable* _tmp12_ = NULL;
#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5425,7 +5428,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_g_object_unref0 (_tmp8_);
#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp8_ = _tmp12_;
-#line 5429 "BatchImport.c"
+#line 5432 "BatchImport.c"
}
#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp13_ = _g_object_ref0 (_tmp8_);
@@ -5437,7 +5440,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_tmp15_ = import_roll;
#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp15_ != NULL) {
-#line 5441 "BatchImport.c"
+#line 5444 "BatchImport.c"
BatchImportRoll* _tmp16_ = NULL;
BatchImportRoll* _tmp17_ = NULL;
#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5448,7 +5451,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_batch_import_roll_unref0 (_tmp14_);
#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp14_ = _tmp17_;
-#line 5452 "BatchImport.c"
+#line 5455 "BatchImport.c"
} else {
BatchImportRoll* _tmp18_ = NULL;
#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5457,7 +5460,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_batch_import_roll_unref0 (_tmp14_);
#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp14_ = _tmp18_;
-#line 5461 "BatchImport.c"
+#line 5464 "BatchImport.c"
}
#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp19_ = _batch_import_roll_ref0 (_tmp14_);
@@ -5469,15 +5472,15 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_tmp20_ = skip_manifest;
#line 490 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp20_ != NULL) {
-#line 5473 "BatchImport.c"
+#line 5476 "BatchImport.c"
GeeHashSet* _tmp21_ = NULL;
#line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+ _tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
#line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (self->priv->skipset);
#line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->skipset = _tmp21_;
-#line 5481 "BatchImport.c"
+#line 5484 "BatchImport.c"
{
GeeList* _source_list = NULL;
ImportManifest* _tmp22_ = NULL;
@@ -5508,7 +5511,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_source_index = -1;
#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 5512 "BatchImport.c"
+#line 5515 "BatchImport.c"
gint _tmp28_ = 0;
gint _tmp29_ = 0;
gint _tmp30_ = 0;
@@ -5532,7 +5535,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
if (!(_tmp29_ < _tmp30_)) {
#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 5536 "BatchImport.c"
+#line 5539 "BatchImport.c"
}
#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp31_ = _source_list;
@@ -5556,11 +5559,11 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_g_object_unref0 (_tmp37_);
#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (source);
-#line 5560 "BatchImport.c"
+#line 5563 "BatchImport.c"
}
#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_source_list);
-#line 5564 "BatchImport.c"
+#line 5567 "BatchImport.c"
}
}
#line 498 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5579,14 +5582,14 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
_g_object_unref0 (_tmp8_);
#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 5583 "BatchImport.c"
+#line 5586 "BatchImport.c"
}
BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) {
#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
return batch_import_construct (TYPE_BATCH_IMPORT, jobs, name, reporter, reporter_target, prefailed, pre_already_imported, cancellable, import_roll, skip_manifest);
-#line 5590 "BatchImport.c"
+#line 5593 "BatchImport.c"
}
@@ -5604,7 +5607,7 @@ gchar* batch_import_get_name (BatchImport* self) {
result = _tmp1_;
#line 512 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 5608 "BatchImport.c"
+#line 5611 "BatchImport.c"
}
@@ -5616,7 +5619,7 @@ void batch_import_user_halt (BatchImport* self) {
_tmp0_ = self->priv->cancellable;
#line 516 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_cancellable_cancel (_tmp0_);
-#line 5620 "BatchImport.c"
+#line 5623 "BatchImport.c"
}
@@ -5631,7 +5634,7 @@ gboolean batch_import_get_untrash_duplicates (BatchImport* self) {
result = _tmp0_;
#line 520 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 5635 "BatchImport.c"
+#line 5638 "BatchImport.c"
}
@@ -5643,7 +5646,7 @@ void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_du
_tmp0_ = untrash_duplicates;
#line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->untrash_duplicates = _tmp0_;
-#line 5647 "BatchImport.c"
+#line 5650 "BatchImport.c"
}
@@ -5658,7 +5661,7 @@ gboolean batch_import_get_mark_duplicates_online (BatchImport* self) {
result = _tmp0_;
#line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 5662 "BatchImport.c"
+#line 5665 "BatchImport.c"
}
@@ -5670,7 +5673,7 @@ void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_d
_tmp0_ = mark_duplicates_online;
#line 532 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->mark_duplicates_online = _tmp0_;
-#line 5674 "BatchImport.c"
+#line 5677 "BatchImport.c"
}
@@ -5679,7 +5682,7 @@ static void batch_import_log_status (BatchImport* self, const gchar* where) {
g_return_if_fail (IS_BATCH_IMPORT (self));
#line 535 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_return_if_fail (where != NULL);
-#line 5683 "BatchImport.c"
+#line 5686 "BatchImport.c"
}
@@ -5690,10 +5693,10 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
BatchImportResult* _tmp1_ = NULL;
BatchImportResult* _tmp2_ = NULL;
ImportResult _tmp3_ = 0;
- gboolean _tmp22_ = FALSE;
- BatchImportResult* _tmp23_ = NULL;
- ImportResult _tmp24_ = 0;
- gboolean _tmp25_ = FALSE;
+ gboolean _tmp23_ = FALSE;
+ BatchImportResult* _tmp24_ = NULL;
+ ImportResult _tmp25_ = 0;
+ gboolean _tmp26_ = FALSE;
GError * _inner_error_ = NULL;
#line 545 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
@@ -5713,7 +5716,7 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
_tmp3_ = _tmp2_->result;
#line 550 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp3_ != IMPORT_RESULT_SUCCESS) {
-#line 5717 "BatchImport.c"
+#line 5720 "BatchImport.c"
BatchImportResult* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
BatchImportResult* _tmp6_ = NULL;
@@ -5728,7 +5731,7 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
_tmp7_ = _tmp6_->file;
#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp7_ != NULL) {
-#line 5732 "BatchImport.c"
+#line 5735 "BatchImport.c"
BatchImportResult* _tmp8_ = NULL;
ImportResult _tmp9_ = 0;
gboolean _tmp10_ = FALSE;
@@ -5740,20 +5743,20 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
_tmp10_ = import_result_is_abort (_tmp9_);
#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp5_ = !_tmp10_;
-#line 5744 "BatchImport.c"
+#line 5747 "BatchImport.c"
} else {
#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp5_ = FALSE;
-#line 5748 "BatchImport.c"
+#line 5751 "BatchImport.c"
}
#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp5_) {
-#line 5752 "BatchImport.c"
+#line 5755 "BatchImport.c"
guint64 filesize = 0ULL;
- guint64 _tmp21_ = 0ULL;
+ guint64 _tmp22_ = 0ULL;
#line 554 "/home/jens/Source/shotwell/src/BatchImport.vala"
filesize = (guint64) 0;
-#line 5757 "BatchImport.c"
+#line 5760 "BatchImport.c"
{
guint64 _tmp11_ = 0ULL;
BatchImportResult* _tmp12_ = NULL;
@@ -5769,12 +5772,12 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
_tmp11_ = _tmp14_;
#line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5773 "BatchImport.c"
+#line 5776 "BatchImport.c"
goto __catch410_g_error;
}
#line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
filesize = _tmp11_;
-#line 5778 "BatchImport.c"
+#line 5781 "BatchImport.c"
}
goto __finally410;
__catch410_g_error:
@@ -5808,72 +5811,74 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
_g_free0 (_tmp18_);
#line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (err);
-#line 5812 "BatchImport.c"
+#line 5815 "BatchImport.c"
}
__finally410:
#line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 5820 "BatchImport.c"
+ gboolean _tmp21_ = FALSE;
#line 555 "/home/jens/Source/shotwell/src/BatchImport.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 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_clear_error (&_inner_error_);
#line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
- return FALSE;
-#line 5823 "BatchImport.c"
+ return _tmp21_;
+#line 5828 "BatchImport.c"
}
#line 563 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp21_ = filesize;
+ _tmp22_ = filesize;
#line 563 "/home/jens/Source/shotwell/src/BatchImport.vala"
- batch_import_report_progress (self, _tmp21_);
-#line 5829 "BatchImport.c"
+ batch_import_report_progress (self, _tmp22_);
+#line 5834 "BatchImport.c"
}
}
#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp23_ = import_result;
+ _tmp24_ = import_result;
#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp24_ = _tmp23_->result;
+ _tmp25_ = _tmp24_->result;
#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp25_ = import_result_is_nonuser_abort (_tmp24_);
+ _tmp26_ = import_result_is_nonuser_abort (_tmp25_);
#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
- if (_tmp25_) {
-#line 5840 "BatchImport.c"
- gboolean _tmp26_ = FALSE;
+ if (_tmp26_) {
+#line 5845 "BatchImport.c"
+ gboolean _tmp27_ = FALSE;
#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp26_ = proceed;
+ _tmp27_ = proceed;
#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp22_ = _tmp26_;
-#line 5846 "BatchImport.c"
+ _tmp23_ = _tmp27_;
+#line 5851 "BatchImport.c"
} else {
#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp22_ = FALSE;
-#line 5850 "BatchImport.c"
+ _tmp23_ = FALSE;
+#line 5855 "BatchImport.c"
}
#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
- if (_tmp22_) {
-#line 5854 "BatchImport.c"
- BatchImportResult* _tmp27_ = NULL;
- ImportResult _tmp28_ = 0;
- BatchImportResult* _tmp29_ = NULL;
- const gchar* _tmp30_ = NULL;
+ if (_tmp23_) {
+#line 5859 "BatchImport.c"
+ BatchImportResult* _tmp28_ = NULL;
+ ImportResult _tmp29_ = 0;
+ BatchImportResult* _tmp30_ = NULL;
+ const gchar* _tmp31_ = NULL;
#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp27_ = import_result;
+ _tmp28_ = import_result;
#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp28_ = _tmp27_->result;
+ _tmp29_ = _tmp28_->result;
#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp29_ = import_result;
+ _tmp30_ = import_result;
#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp30_ = _tmp29_->errmsg;
+ _tmp31_ = _tmp30_->errmsg;
#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
- g_signal_emit_by_name (self, "fatal-error", _tmp28_, _tmp30_);
+ g_signal_emit_by_name (self, "fatal-error", _tmp29_, _tmp31_);
#line 570 "/home/jens/Source/shotwell/src/BatchImport.vala"
proceed = FALSE;
-#line 5871 "BatchImport.c"
+#line 5876 "BatchImport.c"
}
#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = proceed;
#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 5877 "BatchImport.c"
+#line 5882 "BatchImport.c"
}
@@ -5893,7 +5898,7 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
_tmp2_ = self->priv->completed_bytes;
#line 581 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp2_ == ((guint64) 0)) {
-#line 5897 "BatchImport.c"
+#line 5902 "BatchImport.c"
gulong now = 0UL;
gulong _tmp3_ = 0UL;
gulong _tmp4_ = 0UL;
@@ -5908,7 +5913,7 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
_tmp5_ = self->priv->last_preparing_ms;
#line 583 "/home/jens/Source/shotwell/src/BatchImport.vala"
if ((_tmp4_ - _tmp5_) > ((gulong) 250)) {
-#line 5912 "BatchImport.c"
+#line 5917 "BatchImport.c"
gulong _tmp6_ = 0UL;
#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp6_ = now;
@@ -5916,7 +5921,7 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
self->priv->last_preparing_ms = _tmp6_;
#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_signal_emit_by_name (self, "preparing");
-#line 5920 "BatchImport.c"
+#line 5925 "BatchImport.c"
}
} else {
guint64 _tmp7_ = 0ULL;
@@ -5924,7 +5929,7 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
_tmp7_ = increment_of_progress;
#line 587 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp7_ > ((guint64) 0)) {
-#line 5928 "BatchImport.c"
+#line 5933 "BatchImport.c"
gulong now = 0UL;
gulong _tmp8_ = 0UL;
gulong _tmp9_ = 0UL;
@@ -5939,7 +5944,7 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
_tmp10_ = self->priv->last_preparing_ms;
#line 589 "/home/jens/Source/shotwell/src/BatchImport.vala"
if ((_tmp9_ - _tmp10_) > ((gulong) 250)) {
-#line 5943 "BatchImport.c"
+#line 5948 "BatchImport.c"
gulong _tmp11_ = 0UL;
guint64 _tmp12_ = 0ULL;
guint64 _tmp13_ = 0ULL;
@@ -5953,7 +5958,7 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
_tmp13_ = self->priv->total_bytes;
#line 591 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_signal_emit_by_name (self, "progress", _tmp12_, _tmp13_);
-#line 5957 "BatchImport.c"
+#line 5962 "BatchImport.c"
}
}
}
@@ -5969,7 +5974,7 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (background_job), FALSE);
#line 597 "/home/jens/Source/shotwell/src/BatchImport.vala"
proceed = TRUE;
-#line 5973 "BatchImport.c"
+#line 5978 "BatchImport.c"
{
GeeList* _import_result_list = NULL;
BackgroundImportJob* _tmp0_ = NULL;
@@ -6000,7 +6005,7 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
_import_result_index = -1;
#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 6004 "BatchImport.c"
+#line 6009 "BatchImport.c"
gint _tmp6_ = 0;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
@@ -6022,7 +6027,7 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
if (!(_tmp7_ < _tmp8_)) {
#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 6026 "BatchImport.c"
+#line 6031 "BatchImport.c"
}
#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp9_ = _import_result_list;
@@ -6040,21 +6045,21 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
if (!_tmp13_) {
#line 601 "/home/jens/Source/shotwell/src/BatchImport.vala"
proceed = FALSE;
-#line 6044 "BatchImport.c"
+#line 6049 "BatchImport.c"
}
#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
_batch_import_result_unref0 (import_result);
-#line 6048 "BatchImport.c"
+#line 6053 "BatchImport.c"
}
#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_import_result_list);
-#line 6052 "BatchImport.c"
+#line 6057 "BatchImport.c"
}
#line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = proceed;
#line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 6058 "BatchImport.c"
+#line 6063 "BatchImport.c"
}
@@ -6075,14 +6080,14 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
_tmp0_ = self->priv->completed;
#line 608 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp0_) {
-#line 6079 "BatchImport.c"
+#line 6084 "BatchImport.c"
const gchar* _tmp1_ = NULL;
#line 609 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp1_ = where;
#line 609 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_error ("BatchImport.vala:609: Attempted to complete already-completed import: " \
"%s", _tmp1_);
-#line 6085 "BatchImport.c"
+#line 6090 "BatchImport.c"
}
#line 611 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->completed = TRUE;
@@ -6104,7 +6109,7 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
_tmp5__target = self->priv->reporter_target;
#line 618 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp5_ != NULL) {
-#line 6107 "BatchImport.c"
+#line 6112 "BatchImport.c"
BatchImportImportReporter _tmp6_ = NULL;
void* _tmp6__target = NULL;
ImportManifest* _tmp7_ = NULL;
@@ -6119,7 +6124,7 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
_tmp8_ = self->priv->import_roll;
#line 619 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp6_ (_tmp7_, _tmp8_, _tmp6__target);
-#line 6122 "BatchImport.c"
+#line 6127 "BatchImport.c"
}
#line 621 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp9_ = self->priv->manifest;
@@ -6127,7 +6132,7 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
_tmp10_ = self->priv->import_roll;
#line 621 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_signal_emit_by_name (self, "import-complete", _tmp9_, _tmp10_);
-#line 6130 "BatchImport.c"
+#line 6135 "BatchImport.c"
}
@@ -6146,7 +6151,7 @@ static void batch_import_file_import_complete (BatchImport* self) {
_tmp1_ = self->priv->file_imports_to_perform;
#line 628 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_ != -1) {
-#line 6149 "BatchImport.c"
+#line 6154 "BatchImport.c"
gint _tmp2_ = 0;
gint _tmp3_ = 0;
#line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6155,13 +6160,13 @@ static void batch_import_file_import_complete (BatchImport* self) {
_tmp3_ = self->priv->file_imports_to_perform;
#line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
_vala_assert (_tmp2_ <= _tmp3_, "file_imports_completed <= file_imports_to_perform");
-#line 6158 "BatchImport.c"
+#line 6163 "BatchImport.c"
}
#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp5_ = self->priv->file_imports_to_perform;
#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp5_ != -1) {
-#line 6164 "BatchImport.c"
+#line 6169 "BatchImport.c"
gint _tmp6_ = 0;
gint _tmp7_ = 0;
#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6170,17 +6175,17 @@ static void batch_import_file_import_complete (BatchImport* self) {
_tmp7_ = self->priv->file_imports_to_perform;
#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp4_ = _tmp6_ == _tmp7_;
-#line 6173 "BatchImport.c"
+#line 6178 "BatchImport.c"
} else {
#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp4_ = FALSE;
-#line 6177 "BatchImport.c"
+#line 6182 "BatchImport.c"
}
#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp4_) {
#line 634 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_report_completed (self, "completed preparing files, all outstanding imports completed");
-#line 6183 "BatchImport.c"
+#line 6188 "BatchImport.c"
}
}
@@ -6188,14 +6193,14 @@ static void batch_import_file_import_complete (BatchImport* self) {
static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, gpointer self) {
#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_on_work_sniffed_out ((BatchImport*) self, job);
-#line 6191 "BatchImport.c"
+#line 6196 "BatchImport.c"
}
static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_on_sniffer_cancelled ((BatchImport*) self, job);
-#line 6198 "BatchImport.c"
+#line 6203 "BatchImport.c"
}
@@ -6204,7 +6209,7 @@ static gboolean _batch_import_on_sniffer_working_gsource_func (gpointer self) {
result = batch_import_on_sniffer_working ((BatchImport*) self);
#line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 6207 "BatchImport.c"
+#line 6212 "BatchImport.c"
}
@@ -6247,7 +6252,7 @@ void batch_import_schedule (BatchImport* self) {
_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC, _batch_import_on_sniffer_working_gsource_func, g_object_ref (self), g_object_unref);
#line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->throbber_id = _tmp7_;
-#line 6250 "BatchImport.c"
+#line 6255 "BatchImport.c"
}
@@ -6261,35 +6266,35 @@ static gboolean batch_import_on_sniffer_working (BatchImport* self) {
result = TRUE;
#line 656 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 6264 "BatchImport.c"
+#line 6269 "BatchImport.c"
}
static gpointer _background_job_ref0 (gpointer self) {
#line 662 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? background_job_ref (self) : NULL;
-#line 6271 "BatchImport.c"
+#line 6276 "BatchImport.c"
}
static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job, NotificationObject* user, gpointer self) {
#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_on_file_prepared ((BatchImport*) self, job, user);
-#line 6278 "BatchImport.c"
+#line 6283 "BatchImport.c"
}
static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job, gpointer self) {
#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_on_files_prepared ((BatchImport*) self, job);
-#line 6285 "BatchImport.c"
+#line 6290 "BatchImport.c"
}
static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_on_file_prepare_cancelled ((BatchImport*) self, job);
-#line 6292 "BatchImport.c"
+#line 6297 "BatchImport.c"
}
@@ -6335,7 +6340,7 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
if (!_tmp5_) {
#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = TRUE;
-#line 6338 "BatchImport.c"
+#line 6343 "BatchImport.c"
} else {
WorkSniffer* _tmp6_ = NULL;
GeeList* _tmp7_ = NULL;
@@ -6351,7 +6356,7 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
_tmp9_ = _tmp8_;
#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = _tmp9_ == 0;
-#line 6354 "BatchImport.c"
+#line 6359 "BatchImport.c"
}
#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp3_) {
@@ -6361,7 +6366,7 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
_background_job_unref0 (sniffer);
#line 669 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 6364 "BatchImport.c"
+#line 6369 "BatchImport.c"
}
#line 672 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp10_ = sniffer;
@@ -6389,7 +6394,7 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
_tmp18_ = self->priv->throbber_id;
#line 684 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp18_ > ((guint) 0)) {
-#line 6392 "BatchImport.c"
+#line 6397 "BatchImport.c"
guint _tmp19_ = 0U;
#line 685 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp19_ = self->priv->throbber_id;
@@ -6397,13 +6402,13 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
g_source_remove (_tmp19_);
#line 686 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->throbber_id = (guint) 0;
-#line 6400 "BatchImport.c"
+#line 6405 "BatchImport.c"
}
#line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
_background_job_unref0 (prepare_files_job);
#line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
_background_job_unref0 (sniffer);
-#line 6406 "BatchImport.c"
+#line 6411 "BatchImport.c"
}
@@ -6440,7 +6445,7 @@ static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob*
_tmp4_ = self->priv->throbber_id;
#line 700 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp4_ > ((guint) 0)) {
-#line 6443 "BatchImport.c"
+#line 6448 "BatchImport.c"
guint _tmp5_ = 0U;
#line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp5_ = self->priv->throbber_id;
@@ -6448,39 +6453,39 @@ static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob*
g_source_remove (_tmp5_);
#line 702 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->throbber_id = (guint) 0;
-#line 6451 "BatchImport.c"
+#line 6456 "BatchImport.c"
}
#line 690 "/home/jens/Source/shotwell/src/BatchImport.vala"
_background_job_unref0 (sniffer);
-#line 6455 "BatchImport.c"
+#line 6460 "BatchImport.c"
}
static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, gpointer self) {
#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_on_thumbnail_writer_completed ((BatchImport*) self, job);
-#line 6462 "BatchImport.c"
+#line 6467 "BatchImport.c"
}
static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_on_thumbnail_writer_cancelled ((BatchImport*) self, job);
-#line 6469 "BatchImport.c"
+#line 6474 "BatchImport.c"
}
static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, gpointer self) {
#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_on_import_files_completed ((BatchImport*) self, job);
-#line 6476 "BatchImport.c"
+#line 6481 "BatchImport.c"
}
static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_on_import_files_cancelled ((BatchImport*) self, job);
-#line 6483 "BatchImport.c"
+#line 6488 "BatchImport.c"
}
@@ -6489,7 +6494,7 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
g_return_if_fail (IS_BATCH_IMPORT (self));
#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 6492 "BatchImport.c"
+#line 6497 "BatchImport.c"
gboolean _tmp0_ = FALSE;
GeeList* _tmp1_ = NULL;
gint _tmp2_ = 0;
@@ -6509,7 +6514,7 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
_tmp3_ = _tmp2_;
#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp3_ > 0) {
-#line 6512 "BatchImport.c"
+#line 6517 "BatchImport.c"
Workers* _tmp4_ = NULL;
gint _tmp5_ = 0;
guint _tmp6_ = 0U;
@@ -6521,17 +6526,17 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
_tmp6_ = self->priv->max_outstanding_import_jobs;
#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = ((guint) _tmp5_) < _tmp6_;
-#line 6524 "BatchImport.c"
+#line 6529 "BatchImport.c"
} else {
#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = FALSE;
-#line 6528 "BatchImport.c"
+#line 6533 "BatchImport.c"
}
#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp0_) {
#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 6534 "BatchImport.c"
+#line 6539 "BatchImport.c"
}
#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp7_ = batch_import_import_workers;
@@ -6553,11 +6558,11 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
_background_job_unref0 (_tmp13_);
#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
_completed_import_object_unref0 (_tmp10_);
-#line 6556 "BatchImport.c"
+#line 6561 "BatchImport.c"
}
#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 6560 "BatchImport.c"
+#line 6565 "BatchImport.c"
gboolean _tmp14_ = FALSE;
GeeList* _tmp15_ = NULL;
gint _tmp16_ = 0;
@@ -6579,7 +6584,7 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
_tmp17_ = _tmp16_;
#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp17_ > 0) {
-#line 6582 "BatchImport.c"
+#line 6587 "BatchImport.c"
Workers* _tmp18_ = NULL;
gint _tmp19_ = 0;
guint _tmp20_ = 0U;
@@ -6591,17 +6596,17 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
_tmp20_ = self->priv->max_outstanding_import_jobs;
#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp14_ = ((guint) _tmp19_) < _tmp20_;
-#line 6594 "BatchImport.c"
+#line 6599 "BatchImport.c"
} else {
#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp14_ = FALSE;
-#line 6598 "BatchImport.c"
+#line 6603 "BatchImport.c"
}
#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp14_) {
#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 6604 "BatchImport.c"
+#line 6609 "BatchImport.c"
}
#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp21_ = batch_import_import_workers;
@@ -6627,7 +6632,7 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
_background_job_unref0 (_tmp29_);
#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_tmp24_);
-#line 6630 "BatchImport.c"
+#line 6635 "BatchImport.c"
}
}
@@ -6649,7 +6654,7 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
_tmp2_ = _tmp1_->full_md5;
#line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp2_ != NULL) {
-#line 6652 "BatchImport.c"
+#line 6657 "BatchImport.c"
GeeHashMap* _tmp3_ = NULL;
PreparedFile* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
@@ -6664,15 +6669,15 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp6_;
-#line 6667 "BatchImport.c"
+#line 6672 "BatchImport.c"
} else {
#line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = FALSE;
-#line 6671 "BatchImport.c"
+#line 6676 "BatchImport.c"
}
#line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp0_) {
-#line 6675 "BatchImport.c"
+#line 6680 "BatchImport.c"
GeeHashMap* _tmp7_ = NULL;
PreparedFile* _tmp8_ = NULL;
const gchar* _tmp9_ = NULL;
@@ -6689,7 +6694,7 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
result = (GFile*) _tmp10_;
#line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 6692 "BatchImport.c"
+#line 6697 "BatchImport.c"
}
#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp11_ = prepared_file;
@@ -6697,7 +6702,7 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
_tmp12_ = _tmp11_->full_md5;
#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp12_ != NULL) {
-#line 6700 "BatchImport.c"
+#line 6705 "BatchImport.c"
GeeHashMap* _tmp13_ = NULL;
PreparedFile* _tmp14_ = NULL;
const gchar* _tmp15_ = NULL;
@@ -6715,20 +6720,20 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
_tmp17_ = _tmp16_->file;
#line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, _tmp17_);
-#line 6718 "BatchImport.c"
+#line 6723 "BatchImport.c"
}
#line 741 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = NULL;
#line 741 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 6724 "BatchImport.c"
+#line 6729 "BatchImport.c"
}
static gpointer _notification_object_ref0 (gpointer self) {
#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? notification_object_ref (self) : NULL;
-#line 6731 "BatchImport.c"
+#line 6736 "BatchImport.c"
}
@@ -6762,7 +6767,7 @@ static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j,
#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = cluster->list;
#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp5_ = _tmp4_;
#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6779,7 +6784,7 @@ static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j,
batch_import_process_prepared_files (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList), NULL, NULL);
#line 745 "/home/jens/Source/shotwell/src/BatchImport.vala"
_notification_object_unref0 (cluster);
-#line 6782 "BatchImport.c"
+#line 6787 "BatchImport.c"
}
@@ -6792,7 +6797,7 @@ static void batch_import_process_prepared_files_data_free (gpointer _data) {
_g_object_unref0 (_data_->self);
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_slice_free (BatchImportProcessPreparedFilesData, _data_);
-#line 6795 "BatchImport.c"
+#line 6800 "BatchImport.c"
}
@@ -6821,7 +6826,7 @@ static void batch_import_process_prepared_files (BatchImport* self, GeeList* lis
_data_->list = _tmp2_;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_process_prepared_files_co (_data_);
-#line 6824 "BatchImport.c"
+#line 6829 "BatchImport.c"
}
@@ -6829,7 +6834,7 @@ static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyn
BatchImportProcessPreparedFilesData* _data_;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 6832 "BatchImport.c"
+#line 6837 "BatchImport.c"
}
@@ -6838,7 +6843,7 @@ static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer s
result = batch_import_process_prepared_files_co (self);
#line 759 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 6841 "BatchImport.c"
+#line 6846 "BatchImport.c"
}
@@ -6847,16 +6852,16 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
switch (_data_->_state_) {
#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
case 0:
-#line 6850 "BatchImport.c"
+#line 6855 "BatchImport.c"
goto _state_0;
#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
case 1:
-#line 6854 "BatchImport.c"
+#line 6859 "BatchImport.c"
goto _state_1;
default:
#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_assert_not_reached ();
-#line 6859 "BatchImport.c"
+#line 6864 "BatchImport.c"
}
_state_0:
{
@@ -6906,7 +6911,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
if (!(_data_->_tmp6_ < _data_->_tmp7_)) {
#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 6909 "BatchImport.c"
+#line 6914 "BatchImport.c"
}
#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp8_ = NULL;
@@ -6928,7 +6933,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_state_ = 1;
#line 760 "/home/jens/Source/shotwell/src/BatchImport.vala"
return FALSE;
-#line 6931 "BatchImport.c"
+#line 6936 "BatchImport.c"
_state_1:
;
#line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6975,7 +6980,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
-#line 6978 "BatchImport.c"
+#line 6983 "BatchImport.c"
{
#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp18_ = NULL;
@@ -7073,19 +7078,19 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp37_ = _data_->photo;
#line 781 "/home/jens/Source/shotwell/src/BatchImport.vala"
media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7076 "BatchImport.c"
+#line 7081 "BatchImport.c"
}
#line 782 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 7080 "BatchImport.c"
+#line 7085 "BatchImport.c"
}
#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7084 "BatchImport.c"
+#line 7089 "BatchImport.c"
{
#line 786 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 7088 "BatchImport.c"
+#line 7093 "BatchImport.c"
}
default:
{
@@ -7099,7 +7104,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp39_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp38_);
#line 789 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_error ("BatchImport.vala:789: Unknown LibraryPhotoSourceCollection state: %s", (_data_->_tmp39_ != NULL) ? _data_->_tmp39_->value_name : NULL);
-#line 7102 "BatchImport.c"
+#line 7107 "BatchImport.c"
}
}
}
@@ -7125,7 +7130,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_prepared_file_unref0 (_data_->prepared_file);
#line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 7128 "BatchImport.c"
+#line 7133 "BatchImport.c"
}
#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp42_ = NULL;
@@ -7165,7 +7170,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
case VIDEO_SOURCE_COLLECTION_STATE_ONLINE:
#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
case VIDEO_SOURCE_COLLECTION_STATE_OFFLINE:
-#line 7168 "BatchImport.c"
+#line 7173 "BatchImport.c"
{
#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp49_ = NULL;
@@ -7263,19 +7268,19 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp68_ = _data_->video;
#line 812 "/home/jens/Source/shotwell/src/BatchImport.vala"
media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp68_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7266 "BatchImport.c"
+#line 7271 "BatchImport.c"
}
#line 813 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 7270 "BatchImport.c"
+#line 7275 "BatchImport.c"
}
#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
case VIDEO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7274 "BatchImport.c"
+#line 7279 "BatchImport.c"
{
#line 817 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 7278 "BatchImport.c"
+#line 7283 "BatchImport.c"
}
default:
{
@@ -7289,7 +7294,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp70_ = g_enum_get_value (g_type_class_ref (VIDEO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp69_);
#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_error ("BatchImport.vala:820: Unknown VideoSourceCollection state: %s", (_data_->_tmp70_ != NULL) ? _data_->_tmp70_->value_name : NULL);
-#line 7292 "BatchImport.c"
+#line 7297 "BatchImport.c"
}
}
}
@@ -7317,7 +7322,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_prepared_file_unref0 (_data_->prepared_file);
#line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 7320 "BatchImport.c"
+#line 7325 "BatchImport.c"
}
#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp74_ = NULL;
@@ -7351,11 +7356,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp80_ = video_is_duplicate (_data_->_tmp77_, _data_->_tmp79_);
#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp73_ = _data_->_tmp80_;
-#line 7354 "BatchImport.c"
+#line 7359 "BatchImport.c"
} else {
#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp73_ = FALSE;
-#line 7358 "BatchImport.c"
+#line 7363 "BatchImport.c"
}
#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_data_->_tmp73_) {
@@ -7513,7 +7518,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->dupe_video = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, TYPE_VIDEO, Video);
#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
_source_holding_tank_unref0 (_data_->_tmp105_);
-#line 7516 "BatchImport.c"
+#line 7521 "BatchImport.c"
}
#line 849 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp109_ = NULL;
@@ -7594,11 +7599,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
batch_import_file_import_complete (_data_->self);
#line 862 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->result_code = IMPORT_RESULT_SUCCESS;
-#line 7596 "BatchImport.c"
+#line 7601 "BatchImport.c"
}
#line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_data_->dupe_video);
-#line 7600 "BatchImport.c"
+#line 7605 "BatchImport.c"
}
#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp123_ = NULL;
@@ -7698,13 +7703,13 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_prepared_file_unref0 (_data_->prepared_file);
#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 7700 "BatchImport.c"
+#line 7705 "BatchImport.c"
}
#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_data_->duplicated_file);
#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->duplicate_ids = (g_free (_data_->duplicate_ids), NULL);
-#line 7706 "BatchImport.c"
+#line 7711 "BatchImport.c"
}
#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp141_ = NULL;
@@ -7810,7 +7815,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_g_free0 (_data_->_tmp156_);
#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (_data_->_tmp152_);
-#line 7812 "BatchImport.c"
+#line 7817 "BatchImport.c"
} else {
#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp163_ = NULL;
@@ -7884,11 +7889,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp178_ = _data_->_tmp177_->full_md5;
#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp175_ = _data_->_tmp178_ != NULL;
-#line 7886 "BatchImport.c"
+#line 7891 "BatchImport.c"
} else {
#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp175_ = FALSE;
-#line 7890 "BatchImport.c"
+#line 7895 "BatchImport.c"
}
#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_data_->_tmp175_) {
@@ -7912,7 +7917,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_g_object_unref0 (_data_->photo);
#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->photo = _data_->_tmp182_;
-#line 7914 "BatchImport.c"
+#line 7919 "BatchImport.c"
}
#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp183_ = NULL;
@@ -7967,7 +7972,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp192_ = _data_->photo;
#line 900 "/home/jens/Source/shotwell/src/BatchImport.vala"
photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp192_, TYPE_PHOTO, Photo));
-#line 7968 "BatchImport.c"
+#line 7973 "BatchImport.c"
}
}
#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7982,11 +7987,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp195_ = _data_->self->priv->mark_duplicates_online;
#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp193_ = _data_->_tmp195_;
-#line 7983 "BatchImport.c"
+#line 7988 "BatchImport.c"
} else {
#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp193_ = FALSE;
-#line 7987 "BatchImport.c"
+#line 7992 "BatchImport.c"
}
#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_data_->_tmp193_) {
@@ -8026,11 +8031,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp203_ = _data_->_tmp202_->full_md5;
#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp200_ = _data_->_tmp203_ != NULL;
-#line 8027 "BatchImport.c"
+#line 8032 "BatchImport.c"
} else {
#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp200_ = FALSE;
-#line 8031 "BatchImport.c"
+#line 8036 "BatchImport.c"
}
#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_data_->_tmp200_) {
@@ -8054,7 +8059,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_g_object_unref0 (_data_->photo);
#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->photo = _data_->_tmp207_;
-#line 8055 "BatchImport.c"
+#line 8060 "BatchImport.c"
}
#line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp208_ = NULL;
@@ -8103,7 +8108,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_data_->_tmp216_ = _data_->photo;
#line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp216_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 8103 "BatchImport.c"
+#line 8108 "BatchImport.c"
}
}
#line 920 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8218,7 +8223,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_prepared_file_unref0 (_data_->prepared_file);
#line 931 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 8218 "BatchImport.c"
+#line 8223 "BatchImport.c"
}
#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->_tmp238_ = NULL;
@@ -8394,7 +8399,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_g_object_unref0 (_data_->_vala1_duplicated_file);
#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
_data_->photo_ids = (g_free (_data_->photo_ids), NULL);
-#line 8394 "BatchImport.c"
+#line 8399 "BatchImport.c"
}
}
#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8421,7 +8426,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_prepared_file_unref0 (_data_->prepared_file);
#line 952 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 8421 "BatchImport.c"
+#line 8426 "BatchImport.c"
}
#line 955 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_report_progress (_data_->self, (guint64) 0);
@@ -8443,11 +8448,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
_batch_import_result_unref0 (_data_->import_result);
#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_data_->prepared_file);
-#line 8443 "BatchImport.c"
+#line 8448 "BatchImport.c"
}
#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_data_->_prepared_file_list);
-#line 8447 "BatchImport.c"
+#line 8452 "BatchImport.c"
}
#line 959 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_flush_import_jobs (_data_->self);
@@ -8455,17 +8460,17 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
if (_data_->_state_ == 0) {
#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8455 "BatchImport.c"
+#line 8460 "BatchImport.c"
} else {
#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 8459 "BatchImport.c"
+#line 8464 "BatchImport.c"
}
#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_object_unref (_data_->_async_result);
#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
return FALSE;
-#line 8465 "BatchImport.c"
+#line 8470 "BatchImport.c"
}
@@ -8524,23 +8529,23 @@ static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob*
_tmp10_ = self->priv->file_imports_to_perform;
#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp10_ == 0) {
-#line 8524 "BatchImport.c"
+#line 8529 "BatchImport.c"
gboolean _tmp11_ = FALSE;
#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp11_ = self->priv->completed;
#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp9_ = !_tmp11_;
-#line 8530 "BatchImport.c"
+#line 8535 "BatchImport.c"
} else {
#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp9_ = FALSE;
-#line 8534 "BatchImport.c"
+#line 8539 "BatchImport.c"
}
#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp9_) {
#line 981 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_report_completed (self, "no files prepared for import");
-#line 8540 "BatchImport.c"
+#line 8545 "BatchImport.c"
} else {
gboolean _tmp12_ = FALSE;
gint _tmp13_ = 0;
@@ -8551,28 +8556,28 @@ static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob*
_tmp14_ = self->priv->file_imports_to_perform;
#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp13_ == _tmp14_) {
-#line 8551 "BatchImport.c"
+#line 8556 "BatchImport.c"
gboolean _tmp15_ = FALSE;
#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp15_ = self->priv->completed;
#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp12_ = !_tmp15_;
-#line 8557 "BatchImport.c"
+#line 8562 "BatchImport.c"
} else {
#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp12_ = FALSE;
-#line 8561 "BatchImport.c"
+#line 8566 "BatchImport.c"
}
#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp12_) {
#line 983 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_report_completed (self, "completed preparing files, all outstanding imports completed");
-#line 8567 "BatchImport.c"
+#line 8572 "BatchImport.c"
}
}
#line 962 "/home/jens/Source/shotwell/src/BatchImport.vala"
_background_job_unref0 (prepare_files_job);
-#line 8572 "BatchImport.c"
+#line 8577 "BatchImport.c"
}
@@ -8586,7 +8591,7 @@ static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j)
_tmp0_ = j;
#line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_done_preparing_files (self, _tmp0_, "on_files_prepared");
-#line 8586 "BatchImport.c"
+#line 8591 "BatchImport.c"
}
@@ -8600,7 +8605,7 @@ static void batch_import_on_file_prepare_cancelled (BatchImport* self, Backgroun
_tmp0_ = j;
#line 991 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_done_preparing_files (self, _tmp0_, "on_file_prepare_cancelled");
-#line 8600 "BatchImport.c"
+#line 8605 "BatchImport.c"
}
@@ -8644,7 +8649,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp6_ = _tmp5_->failed;
#line 1009 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp6_ != NULL) {
-#line 8644 "BatchImport.c"
+#line 8649 "BatchImport.c"
PreparedFileImportJob* _tmp7_ = NULL;
BatchImportResult* _tmp8_ = NULL;
ImportResult _tmp9_ = 0;
@@ -8666,7 +8671,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
batch_import_report_failure (self, _tmp11_);
#line 1013 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_file_import_complete (self);
-#line 8666 "BatchImport.c"
+#line 8671 "BatchImport.c"
}
#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp12_ = job;
@@ -8674,7 +8679,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp13_ = _tmp12_->ready;
#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp13_ != NULL) {
-#line 8674 "BatchImport.c"
+#line 8679 "BatchImport.c"
PreparedFileImportJob* _tmp14_ = NULL;
ReadyForImport* _tmp15_ = NULL;
BatchImportResult* _tmp16_ = NULL;
@@ -8720,7 +8725,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp23_ = tombstone;
#line 1022 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp23_ != NULL) {
-#line 8720 "BatchImport.c"
+#line 8725 "BatchImport.c"
TombstoneSourceCollection* _tmp24_ = NULL;
Tombstone* _tmp25_ = NULL;
#line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8729,7 +8734,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp25_ = tombstone;
#line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
tombstone_source_collection_resurrect (_tmp24_, _tmp25_);
-#line 8729 "BatchImport.c"
+#line 8734 "BatchImport.c"
}
#line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
source = NULL;
@@ -8741,7 +8746,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp28_ = _tmp27_->is_video;
#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp28_) {
-#line 8741 "BatchImport.c"
+#line 8746 "BatchImport.c"
PreparedFileImportJob* _tmp29_ = NULL;
ReadyForImport* _tmp30_ = NULL;
BatchImportResult* _tmp31_ = NULL;
@@ -8770,7 +8775,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
source = G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource);
#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp31_->result = _tmp36_;
-#line 8770 "BatchImport.c"
+#line 8775 "BatchImport.c"
} else {
PreparedFileImportJob* _tmp37_ = NULL;
ReadyForImport* _tmp38_ = NULL;
@@ -8825,7 +8830,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp50_ = _tmp49_->final_associated_file;
#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp50_ != NULL) {
-#line 8825 "BatchImport.c"
+#line 8830 "BatchImport.c"
BackingPhotoRow* bpr = NULL;
BackingPhotoRow* _tmp51_ = NULL;
BackingPhotoRow* _tmp52_ = NULL;
@@ -8886,7 +8891,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_g_free0 (_tmp63_);
#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_tmp61_);
-#line 8886 "BatchImport.c"
+#line 8891 "BatchImport.c"
{
MediaSource* _tmp66_ = NULL;
BackingPhotoRow* _tmp67_ = NULL;
@@ -8898,7 +8903,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
photo_add_backing_photo_for_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA, _tmp67_, &_inner_error_);
#line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8898 "BatchImport.c"
+#line 8903 "BatchImport.c"
goto __catch411_g_error;
}
}
@@ -8927,7 +8932,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
"or: %s", _tmp69_, _tmp71_);
#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (e);
-#line 8926 "BatchImport.c"
+#line 8931 "BatchImport.c"
}
__finally411:
#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8948,11 +8953,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
g_clear_error (&_inner_error_);
#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 8947 "BatchImport.c"
+#line 8952 "BatchImport.c"
}
#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
_backing_photo_row_unref0 (bpr);
-#line 8951 "BatchImport.c"
+#line 8956 "BatchImport.c"
}
#line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp72_ = photo;
@@ -8960,7 +8965,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp73_ = photo_get_master_file_format (_tmp72_);
#line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp73_ == PHOTO_FILE_FORMAT_RAW) {
-#line 8959 "BatchImport.c"
+#line 8964 "BatchImport.c"
RawDeveloper d = 0;
ConfigFacade* _tmp74_ = NULL;
ConfigFacade* _tmp75_ = NULL;
@@ -8988,7 +8993,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp79_ = d;
#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp79_ == RAW_DEVELOPER_CAMERA) {
-#line 8987 "BatchImport.c"
+#line 8992 "BatchImport.c"
Photo* _tmp80_ = NULL;
RawDeveloper _tmp81_ = 0;
gboolean _tmp82_ = FALSE;
@@ -9000,17 +9005,17 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp82_ = photo_is_raw_developer_available (_tmp80_, _tmp81_);
#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp78_ = !_tmp82_;
-#line 8999 "BatchImport.c"
+#line 9004 "BatchImport.c"
} else {
#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp78_ = FALSE;
-#line 9003 "BatchImport.c"
+#line 9008 "BatchImport.c"
}
#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp78_) {
#line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala"
d = RAW_DEVELOPER_EMBEDDED;
-#line 9009 "BatchImport.c"
+#line 9014 "BatchImport.c"
}
#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp83_ = photo;
@@ -9024,11 +9029,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp86_ = d;
#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
photo_set_raw_developer (_tmp85_, _tmp86_);
-#line 9023 "BatchImport.c"
+#line 9028 "BatchImport.c"
}
#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (photo);
-#line 9027 "BatchImport.c"
+#line 9032 "BatchImport.c"
}
#line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp87_ = job;
@@ -9040,7 +9045,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_tmp90_ = _tmp89_->result;
#line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp90_ != IMPORT_RESULT_SUCCESS) {
-#line 9039 "BatchImport.c"
+#line 9044 "BatchImport.c"
PreparedFileImportJob* _tmp91_ = NULL;
ReadyForImport* _tmp92_ = NULL;
BatchImportResult* _tmp93_ = NULL;
@@ -9076,7 +9081,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
batch_import_report_failure (self, _tmp99_);
#line 1065 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_file_import_complete (self);
-#line 9075 "BatchImport.c"
+#line 9080 "BatchImport.c"
} else {
GeeList* _tmp100_ = NULL;
MediaSource* _tmp101_ = NULL;
@@ -9129,19 +9134,19 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
_completed_import_object_unref0 (_tmp114_);
#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
_thumbnails_unref0 (_tmp105_);
-#line 9128 "BatchImport.c"
+#line 9133 "BatchImport.c"
}
#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (source);
#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (tombstone);
-#line 9134 "BatchImport.c"
+#line 9139 "BatchImport.c"
}
#line 1072 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_flush_import_jobs (self);
#line 998 "/home/jens/Source/shotwell/src/BatchImport.vala"
_background_job_unref0 (job);
-#line 9140 "BatchImport.c"
+#line 9145 "BatchImport.c"
}
@@ -9178,7 +9183,7 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
_tmp4_ = _tmp3_->not_ready;
#line 1082 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp4_ != NULL) {
-#line 9177 "BatchImport.c"
+#line 9182 "BatchImport.c"
PreparedFileImportJob* _tmp5_ = NULL;
PreparedFile* _tmp6_ = NULL;
BatchImportJob* _tmp7_ = NULL;
@@ -9243,7 +9248,7 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
_g_free0 (_tmp15_);
#line 1086 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_file_import_complete (self);
-#line 9242 "BatchImport.c"
+#line 9247 "BatchImport.c"
}
#line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp23_ = job;
@@ -9251,7 +9256,7 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
_tmp24_ = _tmp23_->failed;
#line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp24_ != NULL) {
-#line 9250 "BatchImport.c"
+#line 9255 "BatchImport.c"
PreparedFileImportJob* _tmp25_ = NULL;
BatchImportResult* _tmp26_ = NULL;
#line 1090 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9262,7 +9267,7 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
batch_import_report_failure (self, _tmp26_);
#line 1091 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_file_import_complete (self);
-#line 9261 "BatchImport.c"
+#line 9266 "BatchImport.c"
}
#line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp27_ = job;
@@ -9270,7 +9275,7 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
_tmp28_ = _tmp27_->ready;
#line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp28_ != NULL) {
-#line 9269 "BatchImport.c"
+#line 9274 "BatchImport.c"
PreparedFileImportJob* _tmp29_ = NULL;
ReadyForImport* _tmp30_ = NULL;
BatchImportResult* _tmp31_ = NULL;
@@ -9289,20 +9294,20 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
_batch_import_result_unref0 (_tmp32_);
#line 1096 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_file_import_complete (self);
-#line 9288 "BatchImport.c"
+#line 9293 "BatchImport.c"
}
#line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_flush_import_jobs (self);
#line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala"
_background_job_unref0 (job);
-#line 9294 "BatchImport.c"
+#line 9299 "BatchImport.c"
}
static gpointer _completed_import_object_ref0 (gpointer self) {
#line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? completed_import_object_ref (self) : NULL;
-#line 9301 "BatchImport.c"
+#line 9306 "BatchImport.c"
}
@@ -9350,7 +9355,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
_tmp8_ = _tmp7_->result;
#line 1117 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp8_ != IMPORT_RESULT_SUCCESS) {
-#line 9349 "BatchImport.c"
+#line 9354 "BatchImport.c"
CompletedImportObject* _tmp9_ = NULL;
MediaSource* _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
@@ -9395,7 +9400,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
_tmp19_ = _tmp18_->source;
#line 1121 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO)) {
-#line 9393 "BatchImport.c"
+#line 9398 "BatchImport.c"
CompletedImportObject* _tmp20_ = NULL;
MediaSource* _tmp21_ = NULL;
#line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9404,7 +9409,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
_tmp21_ = _tmp20_->source;
#line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala"
library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL);
-#line 9402 "BatchImport.c"
+#line 9407 "BatchImport.c"
} else {
CompletedImportObject* _tmp22_ = NULL;
MediaSource* _tmp23_ = NULL;
@@ -9414,7 +9419,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
_tmp23_ = _tmp22_->source;
#line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_VIDEO)) {
-#line 9412 "BatchImport.c"
+#line 9417 "BatchImport.c"
CompletedImportObject* _tmp24_ = NULL;
MediaSource* _tmp25_ = NULL;
#line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9423,7 +9428,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
_tmp25_ = _tmp24_->source;
#line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala"
video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO) ? ((Video*) _tmp25_) : NULL);
-#line 9421 "BatchImport.c"
+#line 9426 "BatchImport.c"
}
}
#line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9434,7 +9439,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
batch_import_report_failure (self, _tmp27_);
#line 1127 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_file_import_complete (self);
-#line 9432 "BatchImport.c"
+#line 9437 "BatchImport.c"
} else {
ImportManifest* _tmp28_ = NULL;
GeeList* _tmp29_ = NULL;
@@ -9469,7 +9474,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
_tmp36_ = completed;
#line 1132 "/home/jens/Source/shotwell/src/BatchImport.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_);
-#line 9467 "BatchImport.c"
+#line 9472 "BatchImport.c"
}
#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_flush_import_jobs (self);
@@ -9477,7 +9482,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
_completed_import_object_unref0 (completed);
#line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala"
_background_job_unref0 (job);
-#line 9475 "BatchImport.c"
+#line 9480 "BatchImport.c"
}
@@ -9524,7 +9529,7 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
_tmp7_ = _tmp6_->source;
#line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) {
-#line 9522 "BatchImport.c"
+#line 9527 "BatchImport.c"
CompletedImportObject* _tmp8_ = NULL;
MediaSource* _tmp9_ = NULL;
#line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9533,7 +9538,7 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
_tmp9_ = _tmp8_->source;
#line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp9_) : NULL);
-#line 9531 "BatchImport.c"
+#line 9536 "BatchImport.c"
} else {
CompletedImportObject* _tmp10_ = NULL;
MediaSource* _tmp11_ = NULL;
@@ -9543,7 +9548,7 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
_tmp11_ = _tmp10_->source;
#line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO)) {
-#line 9541 "BatchImport.c"
+#line 9546 "BatchImport.c"
CompletedImportObject* _tmp12_ = NULL;
MediaSource* _tmp13_ = NULL;
#line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9552,7 +9557,7 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
_tmp13_ = _tmp12_->source;
#line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO) ? ((Video*) _tmp13_) : NULL);
-#line 9550 "BatchImport.c"
+#line 9555 "BatchImport.c"
}
}
#line 1151 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9569,7 +9574,7 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
_completed_import_object_unref0 (completed);
#line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
_background_job_unref0 (job);
-#line 9567 "BatchImport.c"
+#line 9572 "BatchImport.c"
}
@@ -9619,7 +9624,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
if (_tmp2_ == 0) {
#line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 9617 "BatchImport.c"
+#line 9622 "BatchImport.c"
}
#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = self->priv->ready_sources;
@@ -9636,22 +9641,22 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (_tmp7_);
#line 1170 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp8_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp8_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1170 "/home/jens/Source/shotwell/src/BatchImport.vala"
all = _tmp8_;
#line 1171 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp9_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp9_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1171 "/home/jens/Source/shotwell/src/BatchImport.vala"
photos = _tmp9_;
#line 1172 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp10_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp10_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1172 "/home/jens/Source/shotwell/src/BatchImport.vala"
videos = _tmp10_;
#line 1173 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp11_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp11_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 1173 "/home/jens/Source/shotwell/src/BatchImport.vala"
completion_list = _tmp11_;
-#line 9649 "BatchImport.c"
+#line 9654 "BatchImport.c"
{
GeeList* _completed_list = NULL;
GeeList* _tmp12_ = NULL;
@@ -9679,7 +9684,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_completed_index = -1;
#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 9677 "BatchImport.c"
+#line 9682 "BatchImport.c"
gint _tmp17_ = 0;
gint _tmp18_ = 0;
gint _tmp19_ = 0;
@@ -9709,7 +9714,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
if (!(_tmp18_ < _tmp19_)) {
#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 9707 "BatchImport.c"
+#line 9712 "BatchImport.c"
}
#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp20_ = _completed_list;
@@ -9733,7 +9738,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_tmp27_ = _tmp26_->source;
#line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_LIBRARY_PHOTO)) {
-#line 9731 "BatchImport.c"
+#line 9736 "BatchImport.c"
GeeArrayList* _tmp28_ = NULL;
CompletedImportObject* _tmp29_ = NULL;
MediaSource* _tmp30_ = NULL;
@@ -9745,7 +9750,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_tmp30_ = _tmp29_->source;
#line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 9743 "BatchImport.c"
+#line 9748 "BatchImport.c"
} else {
CompletedImportObject* _tmp31_ = NULL;
MediaSource* _tmp32_ = NULL;
@@ -9755,7 +9760,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_tmp32_ = _tmp31_->source;
#line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) {
-#line 9753 "BatchImport.c"
+#line 9758 "BatchImport.c"
GeeArrayList* _tmp33_ = NULL;
CompletedImportObject* _tmp34_ = NULL;
MediaSource* _tmp35_ = NULL;
@@ -9767,7 +9772,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_tmp35_ = _tmp34_->source;
#line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIDEO, Video));
-#line 9765 "BatchImport.c"
+#line 9770 "BatchImport.c"
}
}
#line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9784,11 +9789,11 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp40_);
#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
_completed_import_object_unref0 (completed);
-#line 9782 "BatchImport.c"
+#line 9787 "BatchImport.c"
}
#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_completed_list);
-#line 9786 "BatchImport.c"
+#line 9791 "BatchImport.c"
}
#line 1186 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp41_ = media_collection_registry_get_instance ();
@@ -9818,7 +9823,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_tmp48_ = videos;
#line 1191 "/home/jens/Source/shotwell/src/BatchImport.vala"
media_source_collection_import_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 9816 "BatchImport.c"
+#line 9821 "BatchImport.c"
{
GeeIterator* _media_it = NULL;
GeeHashMap* _tmp49_ = NULL;
@@ -9830,7 +9835,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp49_ = completion_list;
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp50_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_MAP, GeeMap));
+ _tmp50_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp51_ = _tmp50_;
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9845,7 +9850,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_media_it = _tmp54_;
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 9843 "BatchImport.c"
+#line 9848 "BatchImport.c"
GeeIterator* _tmp55_ = NULL;
gboolean _tmp56_ = FALSE;
MediaSource* media = NULL;
@@ -9859,7 +9864,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
if (!_tmp56_) {
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 9857 "BatchImport.c"
+#line 9862 "BatchImport.c"
}
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp57_ = _media_it;
@@ -9867,7 +9872,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_tmp58_ = gee_iterator_get (_tmp57_);
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
media = (MediaSource*) _tmp58_;
-#line 9865 "BatchImport.c"
+#line 9870 "BatchImport.c"
{
GeeHashMap* _tmp59_ = NULL;
MediaSource* _tmp60_ = NULL;
@@ -9893,7 +9898,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_batch_import_job_unref0 (_tmp62_);
#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9891 "BatchImport.c"
+#line 9896 "BatchImport.c"
goto __catch412_g_error;
}
}
@@ -9927,7 +9932,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_g_free0 (_tmp67_);
#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (err);
-#line 9924 "BatchImport.c"
+#line 9929 "BatchImport.c"
}
__finally412:
#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9950,15 +9955,15 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
g_clear_error (&_inner_error_);
#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 9947 "BatchImport.c"
+#line 9952 "BatchImport.c"
}
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (media);
-#line 9951 "BatchImport.c"
+#line 9956 "BatchImport.c"
}
#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_media_it);
-#line 9955 "BatchImport.c"
+#line 9960 "BatchImport.c"
}
#line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp70_ = all;
@@ -9996,7 +10001,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
_g_object_unref0 (photos);
#line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (all);
-#line 9993 "BatchImport.c"
+#line 9998 "BatchImport.c"
}
@@ -10029,7 +10034,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
_tmp2_ = _tmp1_;
#line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp2_ == 0) {
-#line 10026 "BatchImport.c"
+#line 10031 "BatchImport.c"
gboolean _tmp3_ = FALSE;
#line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = self->priv->completed;
@@ -10037,7 +10042,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
result = !_tmp3_;
#line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 10034 "BatchImport.c"
+#line 10039 "BatchImport.c"
}
#line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp4_ = self->priv->cancellable;
@@ -10045,7 +10050,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
#line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp5_) {
-#line 10042 "BatchImport.c"
+#line 10047 "BatchImport.c"
GeeList* _tmp6_ = NULL;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
@@ -10057,7 +10062,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
_tmp8_ = _tmp7_;
#line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_debug ("BatchImport.vala:1220: Importing %d photos at once", _tmp8_);
-#line 10054 "BatchImport.c"
+#line 10059 "BatchImport.c"
}
#line 1222 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_log_status (self, "display_imported_timer");
@@ -10069,7 +10074,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
_tmp10_ = g_cancellable_is_cancelled (_tmp9_);
#line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp10_) {
-#line 10066 "BatchImport.c"
+#line 10071 "BatchImport.c"
GeeList* _tmp11_ = NULL;
gint _tmp12_ = 0;
gint _tmp13_ = 0;
@@ -10081,7 +10086,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
_tmp13_ = _tmp12_;
#line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp13_ > BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) {
-#line 10078 "BatchImport.c"
+#line 10083 "BatchImport.c"
GeeList* _tmp14_ = NULL;
gint _tmp15_ = 0;
gint _tmp16_ = 0;
@@ -10096,12 +10101,12 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
_tmp17_ = CLAMP ((_tmp16_ / BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) + 2, 0, 16);
#line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala"
total = 1 << _tmp17_;
-#line 10093 "BatchImport.c"
+#line 10098 "BatchImport.c"
}
} else {
#line 1239 "/home/jens/Source/shotwell/src/BatchImport.vala"
total = BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW;
-#line 10098 "BatchImport.c"
+#line 10103 "BatchImport.c"
}
#line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp18_ = total;
@@ -10117,7 +10122,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
total = _tmp22_;
#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 10114 "BatchImport.c"
+#line 10119 "BatchImport.c"
gint _tmp23_ = 0;
CompletedImportObject* completed_object = NULL;
GeeList* _tmp24_ = NULL;
@@ -10145,7 +10150,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
if (!(_tmp23_ > 0)) {
#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 10142 "BatchImport.c"
+#line 10147 "BatchImport.c"
}
#line 1253 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp24_ = self->priv->display_imported_queue;
@@ -10203,7 +10208,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
_g_object_unref0 (user_preview);
#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
_completed_import_object_unref0 (completed_object);
-#line 10200 "BatchImport.c"
+#line 10205 "BatchImport.c"
}
#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp41_ = self->priv->ready_sources;
@@ -10215,7 +10220,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
if (_tmp43_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) {
#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp40_ = TRUE;
-#line 10212 "BatchImport.c"
+#line 10217 "BatchImport.c"
} else {
GCancellable* _tmp44_ = NULL;
gboolean _tmp45_ = FALSE;
@@ -10225,19 +10230,19 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
_tmp45_ = g_cancellable_is_cancelled (_tmp44_);
#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp40_ = _tmp45_;
-#line 10222 "BatchImport.c"
+#line 10227 "BatchImport.c"
}
#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp40_) {
#line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_flush_ready_sources (self);
-#line 10228 "BatchImport.c"
+#line 10233 "BatchImport.c"
}
#line 1275 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = TRUE;
#line 1275 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 10234 "BatchImport.c"
+#line 10239 "BatchImport.c"
}
@@ -10256,19 +10261,19 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa
data1 = closure->data;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = param_values->data[0].v_pointer;
-#line 10253 "BatchImport.c"
+#line 10258 "BatchImport.c"
} else {
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data1 = param_values->data[0].v_pointer;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = closure->data;
-#line 10259 "BatchImport.c"
+#line 10264 "BatchImport.c"
}
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback);
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2);
-#line 10265 "BatchImport.c"
+#line 10270 "BatchImport.c"
}
@@ -10287,19 +10292,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure,
data1 = closure->data;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = param_values->data[0].v_pointer;
-#line 10284 "BatchImport.c"
+#line 10289 "BatchImport.c"
} else {
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data1 = param_values->data[0].v_pointer;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = closure->data;
-#line 10290 "BatchImport.c"
+#line 10295 "BatchImport.c"
}
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback = (GMarshalFunc_VOID__OBJECT_OBJECT_INT) (marshal_data ? marshal_data : cc->callback);
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_int (param_values + 3), data2);
-#line 10296 "BatchImport.c"
+#line 10301 "BatchImport.c"
}
@@ -10318,19 +10323,19 @@ static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValu
data1 = closure->data;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = param_values->data[0].v_pointer;
-#line 10315 "BatchImport.c"
+#line 10320 "BatchImport.c"
} else {
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data1 = param_values->data[0].v_pointer;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = closure->data;
-#line 10321 "BatchImport.c"
+#line 10326 "BatchImport.c"
}
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback = (GMarshalFunc_VOID__ENUM_STRING) (marshal_data ? marshal_data : cc->callback);
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback (data1, g_value_get_enum (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 10327 "BatchImport.c"
+#line 10332 "BatchImport.c"
}
@@ -10349,19 +10354,19 @@ static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closur
data1 = closure->data;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = param_values->data[0].v_pointer;
-#line 10346 "BatchImport.c"
+#line 10351 "BatchImport.c"
} else {
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data1 = param_values->data[0].v_pointer;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = closure->data;
-#line 10352 "BatchImport.c"
+#line 10357 "BatchImport.c"
}
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback = (GMarshalFunc_VOID__BATCH_IMPORT_RESULT) (marshal_data ? marshal_data : cc->callback);
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback (data1, value_get_batch_import_result (param_values + 1), data2);
-#line 10358 "BatchImport.c"
+#line 10363 "BatchImport.c"
}
@@ -10380,19 +10385,19 @@ static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GCl
data1 = closure->data;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = param_values->data[0].v_pointer;
-#line 10377 "BatchImport.c"
+#line 10382 "BatchImport.c"
} else {
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data1 = param_values->data[0].v_pointer;
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
data2 = closure->data;
-#line 10383 "BatchImport.c"
+#line 10388 "BatchImport.c"
}
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback = (GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL) (marshal_data ? marshal_data : cc->callback);
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
callback (data1, value_get_import_manifest (param_values + 1), value_get_batch_import_roll (param_values + 2), data2);
-#line 10389 "BatchImport.c"
+#line 10394 "BatchImport.c"
}
@@ -10430,7 +10435,7 @@ static void batch_import_class_init (BatchImportClass * klass) {
_tmp2_ = workers_new (_tmp1_, FALSE);
#line 414 "/home/jens/Source/shotwell/src/BatchImport.vala"
batch_import_import_workers = _tmp2_;
-#line 10427 "BatchImport.c"
+#line 10432 "BatchImport.c"
}
@@ -10460,7 +10465,7 @@ static void batch_import_instance_init (BatchImport * self) {
#line 428 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->last_preparing_ms = (gulong) 0;
#line 431 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 431 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->imported_full_md5_table = _tmp0_;
#line 433 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10474,22 +10479,22 @@ static void batch_import_instance_init (BatchImport * self) {
#line 436 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->mark_duplicates_online = TRUE;
#line 440 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp2_ = gee_linked_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, prepared_file_unref, NULL, NULL, NULL);
+ _tmp2_ = gee_linked_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
#line 440 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->ready_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
#line 441 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp3_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, completed_import_object_unref, NULL, NULL, NULL);
+ _tmp3_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
#line 441 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->ready_thumbnails = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList);
#line 443 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp4_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, completed_import_object_unref, NULL, NULL, NULL);
+ _tmp4_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
#line 443 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->display_imported_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
#line 445 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp5_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, completed_import_object_unref, NULL, NULL, NULL);
+ _tmp5_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
#line 445 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->ready_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
-#line 10486 "BatchImport.c"
+#line 10491 "BatchImport.c"
}
@@ -10534,7 +10539,7 @@ static void batch_import_finalize (GObject* obj) {
_g_object_unref0 (self->priv->ready_sources);
#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
G_OBJECT_CLASS (batch_import_parent_class)->finalize (obj);
-#line 10531 "BatchImport.c"
+#line 10536 "BatchImport.c"
}
@@ -10568,21 +10573,21 @@ static DuplicatedFile* duplicated_file_construct (GType object_type) {
self->priv->file = NULL;
#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 10565 "BatchImport.c"
+#line 10570 "BatchImport.c"
}
static DuplicatedFile* duplicated_file_new (void) {
#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
return duplicated_file_construct (TYPE_DUPLICATED_FILE);
-#line 10572 "BatchImport.c"
+#line 10577 "BatchImport.c"
}
static gpointer _photo_id_dup0 (gpointer self) {
#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? photo_id_dup (self) : NULL;
-#line 10579 "BatchImport.c"
+#line 10584 "BatchImport.c"
}
@@ -10615,14 +10620,14 @@ DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id) {
result = _result_;
#line 1295 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 10612 "BatchImport.c"
+#line 10617 "BatchImport.c"
}
static gpointer _video_id_dup0 (gpointer self) {
#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? video_id_dup (self) : NULL;
-#line 10619 "BatchImport.c"
+#line 10624 "BatchImport.c"
}
@@ -10655,7 +10660,7 @@ DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id) {
result = _result_;
#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 10652 "BatchImport.c"
+#line 10657 "BatchImport.c"
}
@@ -10683,7 +10688,7 @@ DuplicatedFile* duplicated_file_create_from_file (GFile* file) {
result = _result_;
#line 1311 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 10680 "BatchImport.c"
+#line 10685 "BatchImport.c"
}
@@ -10696,7 +10701,7 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
_tmp0_ = self->priv->file;
#line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp0_ != NULL) {
-#line 10693 "BatchImport.c"
+#line 10698 "BatchImport.c"
GFile* _tmp1_ = NULL;
GFile* _tmp2_ = NULL;
#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10707,14 +10712,14 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
result = _tmp2_;
#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 10704 "BatchImport.c"
+#line 10709 "BatchImport.c"
} else {
PhotoID* _tmp3_ = NULL;
#line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = self->priv->photo_id;
#line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp3_ != NULL) {
-#line 10711 "BatchImport.c"
+#line 10716 "BatchImport.c"
Photo* photo_object = NULL;
LibraryPhotoSourceCollection* _tmp4_ = NULL;
PhotoID* _tmp5_ = NULL;
@@ -10752,14 +10757,14 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
_g_object_unref0 (photo_object);
#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 10749 "BatchImport.c"
+#line 10754 "BatchImport.c"
} else {
VideoID* _tmp12_ = NULL;
#line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp12_ = self->priv->video_id;
#line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp12_ != NULL) {
-#line 10756 "BatchImport.c"
+#line 10761 "BatchImport.c"
Video* video_object = NULL;
VideoSourceCollection* _tmp13_ = NULL;
VideoID* _tmp14_ = NULL;
@@ -10797,11 +10802,11 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
_g_object_unref0 (video_object);
#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 10794 "BatchImport.c"
+#line 10799 "BatchImport.c"
} else {
#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_assert_not_reached ();
-#line 10798 "BatchImport.c"
+#line 10803 "BatchImport.c"
}
}
}
@@ -10815,14 +10820,14 @@ static void duplicated_file_class_init (DuplicatedFileClass * klass) {
g_type_class_add_private (klass, sizeof (DuplicatedFilePrivate));
#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
G_OBJECT_CLASS (klass)->finalize = duplicated_file_finalize;
-#line 10812 "BatchImport.c"
+#line 10817 "BatchImport.c"
}
static void duplicated_file_instance_init (DuplicatedFile * self) {
#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv = DUPLICATED_FILE_GET_PRIVATE (self);
-#line 10819 "BatchImport.c"
+#line 10824 "BatchImport.c"
}
@@ -10838,7 +10843,7 @@ static void duplicated_file_finalize (GObject* obj) {
_g_object_unref0 (self->priv->file);
#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
G_OBJECT_CLASS (duplicated_file_parent_class)->finalize (obj);
-#line 10835 "BatchImport.c"
+#line 10840 "BatchImport.c"
}
@@ -10882,7 +10887,7 @@ BackgroundImportJob* background_import_job_construct (GType object_type, BatchIm
self = (BackgroundImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL);
#line 1353 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 10879 "BatchImport.c"
+#line 10884 "BatchImport.c"
}
@@ -10897,23 +10902,23 @@ ImportResult background_import_job_abort_check (BackgroundImportJob* self) {
_tmp1_ = self->abort_flag;
#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_ == IMPORT_RESULT_SUCCESS) {
-#line 10894 "BatchImport.c"
+#line 10899 "BatchImport.c"
gboolean _tmp2_ = FALSE;
#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp2_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp2_;
-#line 10900 "BatchImport.c"
+#line 10905 "BatchImport.c"
} else {
#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = FALSE;
-#line 10904 "BatchImport.c"
+#line 10909 "BatchImport.c"
}
#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp0_) {
#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->abort_flag = IMPORT_RESULT_USER_ABORT;
-#line 10910 "BatchImport.c"
+#line 10915 "BatchImport.c"
}
#line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = self->abort_flag;
@@ -10921,7 +10926,7 @@ ImportResult background_import_job_abort_check (BackgroundImportJob* self) {
result = _tmp3_;
#line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 10918 "BatchImport.c"
+#line 10923 "BatchImport.c"
}
@@ -10933,13 +10938,13 @@ void background_import_job_abort (BackgroundImportJob* self, ImportResult _resul
_tmp0_ = self->abort_flag;
#line 1369 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp0_ == IMPORT_RESULT_SUCCESS) {
-#line 10930 "BatchImport.c"
+#line 10935 "BatchImport.c"
ImportResult _tmp1_ = 0;
#line 1370 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp1_ = _result_;
#line 1370 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->abort_flag = _tmp1_;
-#line 10936 "BatchImport.c"
+#line 10941 "BatchImport.c"
}
}
@@ -10976,13 +10981,13 @@ void background_import_job_report_failure (BackgroundImportJob* self, BatchImpor
_tmp2_ = import_result_is_abort (_tmp1_);
#line 1378 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp2_) {
-#line 10973 "BatchImport.c"
+#line 10978 "BatchImport.c"
ImportResult _tmp3_ = 0;
#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = _result_;
#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
background_import_job_abort (self, _tmp3_);
-#line 10979 "BatchImport.c"
+#line 10984 "BatchImport.c"
} else {
const gchar* _tmp4_ = NULL;
ImportResult _tmp5_ = 0;
@@ -11000,7 +11005,7 @@ void background_import_job_report_failure (BackgroundImportJob* self, BatchImpor
g_warning ("BatchImport.vala:1381: Import failure %s: %s", _tmp4_, _tmp7_);
#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (_tmp7_);
-#line 10997 "BatchImport.c"
+#line 11002 "BatchImport.c"
}
#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp8_ = self->failed;
@@ -11022,7 +11027,7 @@ void background_import_job_report_failure (BackgroundImportJob* self, BatchImpor
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
_batch_import_result_unref0 (_tmp15_);
-#line 11019 "BatchImport.c"
+#line 11024 "BatchImport.c"
}
@@ -11088,13 +11093,13 @@ void background_import_job_report_error (BackgroundImportJob* self, BatchImportJ
_tmp10_ = import_result_is_abort (_tmp9_);
#line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp10_) {
-#line 11085 "BatchImport.c"
+#line 11090 "BatchImport.c"
ImportResult _tmp11_ = 0;
#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp11_ = _result_;
#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
background_import_job_abort (self, _tmp11_);
-#line 11091 "BatchImport.c"
+#line 11096 "BatchImport.c"
}
#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp12_ = self->failed;
@@ -11118,7 +11123,7 @@ void background_import_job_report_error (BackgroundImportJob* self, BatchImportJ
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
_batch_import_result_unref0 (_tmp20_);
-#line 11115 "BatchImport.c"
+#line 11120 "BatchImport.c"
}
@@ -11127,7 +11132,7 @@ static void background_import_job_class_init (BackgroundImportJobClass * klass)
background_import_job_parent_class = g_type_class_peek_parent (klass);
#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala"
((BackgroundJobClass *) klass)->finalize = background_import_job_finalize;
-#line 11124 "BatchImport.c"
+#line 11129 "BatchImport.c"
}
@@ -11136,10 +11141,10 @@ static void background_import_job_instance_init (BackgroundImportJob * self) {
#line 1350 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->abort_flag = IMPORT_RESULT_SUCCESS;
#line 1351 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+ _tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
#line 1351 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 11136 "BatchImport.c"
+#line 11141 "BatchImport.c"
}
@@ -11151,7 +11156,7 @@ static void background_import_job_finalize (BackgroundJob* obj) {
_g_object_unref0 (self->failed);
#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala"
BACKGROUND_JOB_CLASS (background_import_job_parent_class)->finalize (obj);
-#line 11148 "BatchImport.c"
+#line 11153 "BatchImport.c"
}
@@ -11202,21 +11207,21 @@ FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job
self->copy_to_library = _tmp4_;
#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 11199 "BatchImport.c"
+#line 11204 "BatchImport.c"
}
FileToPrepare* file_to_prepare_new (BatchImportJob* job, GFile* file, gboolean copy_to_library) {
#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
return file_to_prepare_construct (TYPE_FILE_TO_PREPARE, job, file, copy_to_library);
-#line 11206 "BatchImport.c"
+#line 11211 "BatchImport.c"
}
static gpointer _file_to_prepare_ref0 (gpointer self) {
#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? file_to_prepare_ref (self) : NULL;
-#line 11213 "BatchImport.c"
+#line 11218 "BatchImport.c"
}
@@ -11235,7 +11240,7 @@ void file_to_prepare_set_associated (FileToPrepare* self, FileToPrepare* a) {
_file_to_prepare_unref0 (self->associated);
#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->associated = _tmp1_;
-#line 11232 "BatchImport.c"
+#line 11237 "BatchImport.c"
}
@@ -11249,7 +11254,7 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
_tmp1_ = self->file;
#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_ != NULL) {
-#line 11246 "BatchImport.c"
+#line 11251 "BatchImport.c"
GFile* _tmp2_ = NULL;
GFile* _tmp3_ = NULL;
GFile* _tmp4_ = NULL;
@@ -11268,7 +11273,7 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
_tmp0_ = _tmp5_;
#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_tmp4_);
-#line 11265 "BatchImport.c"
+#line 11270 "BatchImport.c"
} else {
BatchImportJob* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
@@ -11280,13 +11285,13 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
_g_free0 (_tmp0_);
#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp7_;
-#line 11277 "BatchImport.c"
+#line 11282 "BatchImport.c"
}
#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = _tmp0_;
#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 11283 "BatchImport.c"
+#line 11288 "BatchImport.c"
}
@@ -11300,7 +11305,7 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
_tmp1_ = self->file;
#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_ != NULL) {
-#line 11297 "BatchImport.c"
+#line 11302 "BatchImport.c"
GFile* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11311,7 +11316,7 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
_g_free0 (_tmp0_);
#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp3_;
-#line 11308 "BatchImport.c"
+#line 11313 "BatchImport.c"
} else {
BatchImportJob* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -11358,13 +11363,13 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
_g_object_unref0 (_tmp8_);
#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (_tmp6_);
-#line 11355 "BatchImport.c"
+#line 11360 "BatchImport.c"
}
#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = _tmp0_;
#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 11361 "BatchImport.c"
+#line 11366 "BatchImport.c"
}
@@ -11378,7 +11383,7 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
_tmp1_ = self->file;
#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_ != NULL) {
-#line 11375 "BatchImport.c"
+#line 11380 "BatchImport.c"
GFile* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11389,7 +11394,7 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
_g_free0 (_tmp0_);
#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp3_;
-#line 11386 "BatchImport.c"
+#line 11391 "BatchImport.c"
} else {
BatchImportJob* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -11401,13 +11406,13 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
_g_free0 (_tmp0_);
#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp5_;
-#line 11398 "BatchImport.c"
+#line 11403 "BatchImport.c"
}
#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = _tmp0_;
#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 11404 "BatchImport.c"
+#line 11409 "BatchImport.c"
}
@@ -11421,7 +11426,7 @@ gboolean file_to_prepare_is_directory (FileToPrepare* self) {
_tmp1_ = self->file;
#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_ != NULL) {
-#line 11418 "BatchImport.c"
+#line 11423 "BatchImport.c"
GFile* _tmp2_ = NULL;
GFileType _tmp3_ = 0;
#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11430,7 +11435,7 @@ gboolean file_to_prepare_is_directory (FileToPrepare* self) {
_tmp3_ = g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL);
#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp3_ == G_FILE_TYPE_DIRECTORY;
-#line 11427 "BatchImport.c"
+#line 11432 "BatchImport.c"
} else {
BatchImportJob* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
@@ -11440,20 +11445,20 @@ gboolean file_to_prepare_is_directory (FileToPrepare* self) {
_tmp5_ = batch_import_job_is_directory (_tmp4_);
#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp5_;
-#line 11437 "BatchImport.c"
+#line 11442 "BatchImport.c"
}
#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = _tmp0_;
#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 11443 "BatchImport.c"
+#line 11448 "BatchImport.c"
}
static void value_file_to_prepare_init (GValue* value) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 11450 "BatchImport.c"
+#line 11455 "BatchImport.c"
}
@@ -11462,7 +11467,7 @@ static void value_file_to_prepare_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
file_to_prepare_unref (value->data[0].v_pointer);
-#line 11459 "BatchImport.c"
+#line 11464 "BatchImport.c"
}
}
@@ -11472,11 +11477,11 @@ static void value_file_to_prepare_copy_value (const GValue* src_value, GValue* d
if (src_value->data[0].v_pointer) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = file_to_prepare_ref (src_value->data[0].v_pointer);
-#line 11469 "BatchImport.c"
+#line 11474 "BatchImport.c"
} else {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 11473 "BatchImport.c"
+#line 11478 "BatchImport.c"
}
}
@@ -11484,37 +11489,37 @@ static void value_file_to_prepare_copy_value (const GValue* src_value, GValue* d
static gpointer value_file_to_prepare_peek_pointer (const GValue* value) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 11481 "BatchImport.c"
+#line 11486 "BatchImport.c"
}
static gchar* value_file_to_prepare_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (collect_values[0].v_pointer) {
-#line 11488 "BatchImport.c"
+#line 11493 "BatchImport.c"
FileToPrepare* object;
object = collect_values[0].v_pointer;
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (object->parent_instance.g_class == NULL) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11495 "BatchImport.c"
+#line 11500 "BatchImport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.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 11499 "BatchImport.c"
+#line 11504 "BatchImport.c"
}
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = file_to_prepare_ref (object);
-#line 11503 "BatchImport.c"
+#line 11508 "BatchImport.c"
} else {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 11507 "BatchImport.c"
+#line 11512 "BatchImport.c"
}
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 11511 "BatchImport.c"
+#line 11516 "BatchImport.c"
}
@@ -11525,25 +11530,25 @@ static gchar* value_file_to_prepare_lcopy_value (const GValue* value, guint n_co
if (!object_p) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11522 "BatchImport.c"
+#line 11527 "BatchImport.c"
}
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!value->data[0].v_pointer) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = NULL;
-#line 11528 "BatchImport.c"
+#line 11533 "BatchImport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = value->data[0].v_pointer;
-#line 11532 "BatchImport.c"
+#line 11537 "BatchImport.c"
} else {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = file_to_prepare_ref (value->data[0].v_pointer);
-#line 11536 "BatchImport.c"
+#line 11541 "BatchImport.c"
}
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 11540 "BatchImport.c"
+#line 11545 "BatchImport.c"
}
@@ -11557,7 +11562,7 @@ GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, co
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
return G_PARAM_SPEC (spec);
-#line 11554 "BatchImport.c"
+#line 11559 "BatchImport.c"
}
@@ -11566,7 +11571,7 @@ gpointer value_get_file_to_prepare (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE), NULL);
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 11563 "BatchImport.c"
+#line 11568 "BatchImport.c"
}
@@ -11586,17 +11591,17 @@ void value_set_file_to_prepare (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
file_to_prepare_ref (value->data[0].v_pointer);
-#line 11583 "BatchImport.c"
+#line 11588 "BatchImport.c"
} else {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 11587 "BatchImport.c"
+#line 11592 "BatchImport.c"
}
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
file_to_prepare_unref (old);
-#line 11593 "BatchImport.c"
+#line 11598 "BatchImport.c"
}
}
@@ -11615,17 +11620,17 @@ void value_take_file_to_prepare (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = v_object;
-#line 11612 "BatchImport.c"
+#line 11617 "BatchImport.c"
} else {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 11616 "BatchImport.c"
+#line 11621 "BatchImport.c"
}
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
file_to_prepare_unref (old);
-#line 11622 "BatchImport.c"
+#line 11627 "BatchImport.c"
}
}
@@ -11635,7 +11640,7 @@ static void file_to_prepare_class_init (FileToPrepareClass * klass) {
file_to_prepare_parent_class = g_type_class_peek_parent (klass);
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
((FileToPrepareClass *) klass)->finalize = file_to_prepare_finalize;
-#line 11632 "BatchImport.c"
+#line 11637 "BatchImport.c"
}
@@ -11644,7 +11649,7 @@ static void file_to_prepare_instance_init (FileToPrepare * self) {
self->associated = NULL;
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->ref_count = 1;
-#line 11641 "BatchImport.c"
+#line 11646 "BatchImport.c"
}
@@ -11660,7 +11665,7 @@ static void file_to_prepare_finalize (FileToPrepare* obj) {
_g_object_unref0 (self->file);
#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
_file_to_prepare_unref0 (self->associated);
-#line 11657 "BatchImport.c"
+#line 11662 "BatchImport.c"
}
@@ -11685,7 +11690,7 @@ gpointer file_to_prepare_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
return instance;
-#line 11682 "BatchImport.c"
+#line 11687 "BatchImport.c"
}
@@ -11698,7 +11703,7 @@ void file_to_prepare_unref (gpointer instance) {
FILE_TO_PREPARE_GET_CLASS (self)->finalize (self);
#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 11695 "BatchImport.c"
+#line 11700 "BatchImport.c"
}
}
@@ -11755,14 +11760,14 @@ WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeI
self->priv->skipset = _tmp7_;
#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 11752 "BatchImport.c"
+#line 11757 "BatchImport.c"
}
WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) {
#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
return work_sniffer_construct (TYPE_WORK_SNIFFER, owner, jobs, callback, callback_target, cancellable, cancellation, cancellation_target, skipset);
-#line 11759 "BatchImport.c"
+#line 11764 "BatchImport.c"
}
@@ -11817,7 +11822,7 @@ static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b)
_file_to_prepare_unref0 (file_a);
#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 11814 "BatchImport.c"
+#line 11819 "BatchImport.c"
}
@@ -11826,7 +11831,7 @@ static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, g
result = __lambda10_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b);
#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 11823 "BatchImport.c"
+#line 11828 "BatchImport.c"
}
@@ -11838,7 +11843,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
GError * _inner_error_ = NULL;
#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_WORK_SNIFFER, WorkSniffer);
-#line 11835 "BatchImport.c"
+#line 11840 "BatchImport.c"
{
GeeIterator* _job_it = NULL;
GeeIterable* _tmp0_ = NULL;
@@ -11851,7 +11856,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_job_it = _tmp1_;
#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 11848 "BatchImport.c"
+#line 11853 "BatchImport.c"
GeeIterator* _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
BatchImportJob* job = NULL;
@@ -11869,7 +11874,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
if (!_tmp3_) {
#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 11866 "BatchImport.c"
+#line 11871 "BatchImport.c"
}
#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp4_ = _job_it;
@@ -11885,7 +11890,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_tmp7_ = _result_;
#line 1457 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp7_ != IMPORT_RESULT_SUCCESS) {
-#line 11882 "BatchImport.c"
+#line 11887 "BatchImport.c"
BatchImportJob* _tmp8_ = NULL;
BatchImportJob* _tmp9_ = NULL;
gchar* _tmp10_ = NULL;
@@ -11920,7 +11925,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_batch_import_job_unref0 (job);
#line 1461 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 11917 "BatchImport.c"
+#line 11922 "BatchImport.c"
}
{
BatchImportJob* _tmp16_ = NULL;
@@ -11930,7 +11935,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
work_sniffer_sniff_job (self, _tmp16_, &_inner_error_);
#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11927 "BatchImport.c"
+#line 11932 "BatchImport.c"
goto __catch413_g_error;
}
}
@@ -11974,7 +11979,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_g_free0 (_tmp20_);
#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (err);
-#line 11971 "BatchImport.c"
+#line 11976 "BatchImport.c"
}
__finally413:
#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11989,7 +11994,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
g_clear_error (&_inner_error_);
#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 11986 "BatchImport.c"
+#line 11991 "BatchImport.c"
}
#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp25_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
@@ -11999,21 +12004,21 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_batch_import_job_unref0 (job);
#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 11996 "BatchImport.c"
+#line 12001 "BatchImport.c"
}
#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
_batch_import_job_unref0 (job);
-#line 12000 "BatchImport.c"
+#line 12005 "BatchImport.c"
}
#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_job_it);
-#line 12004 "BatchImport.c"
+#line 12009 "BatchImport.c"
}
#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp26_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, file_to_prepare_unref, NULL, NULL, NULL);
+ _tmp26_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL);
#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala"
sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_LIST, GeeList);
-#line 12010 "BatchImport.c"
+#line 12015 "BatchImport.c"
{
GeeList* _ftp_list = NULL;
GeeList* _tmp27_ = NULL;
@@ -12041,7 +12046,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_ftp_index = -1;
#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 12038 "BatchImport.c"
+#line 12043 "BatchImport.c"
gint _tmp32_ = 0;
gint _tmp33_ = 0;
gint _tmp34_ = 0;
@@ -12063,7 +12068,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
if (!(_tmp33_ < _tmp34_)) {
#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 12060 "BatchImport.c"
+#line 12065 "BatchImport.c"
}
#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp35_ = _ftp_list;
@@ -12079,7 +12084,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_tmp39_ = file_to_prepare_is_directory (_tmp38_);
#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp39_) {
-#line 12076 "BatchImport.c"
+#line 12081 "BatchImport.c"
GeeList* _tmp40_ = NULL;
FileToPrepare* _tmp41_ = NULL;
#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12088,33 +12093,33 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_tmp41_ = ftp;
#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_);
-#line 12085 "BatchImport.c"
+#line 12090 "BatchImport.c"
}
#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
_file_to_prepare_unref0 (ftp);
-#line 12089 "BatchImport.c"
+#line 12094 "BatchImport.c"
}
#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_ftp_list);
-#line 12093 "BatchImport.c"
+#line 12098 "BatchImport.c"
}
#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp42_ = sorted;
#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
gee_list_sort (_tmp42_, ___lambda10__gcompare_data_func, background_job_ref (self), background_job_unref);
-#line 12099 "BatchImport.c"
+#line 12104 "BatchImport.c"
{
gint i = 0;
#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
i = 0;
-#line 12104 "BatchImport.c"
+#line 12109 "BatchImport.c"
{
gboolean _tmp43_ = FALSE;
#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp43_ = TRUE;
#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 12111 "BatchImport.c"
+#line 12116 "BatchImport.c"
gint _tmp45_ = 0;
GeeList* _tmp46_ = NULL;
gint _tmp47_ = 0;
@@ -12139,13 +12144,13 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
gboolean _tmp63_ = FALSE;
#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp43_) {
-#line 12136 "BatchImport.c"
+#line 12141 "BatchImport.c"
gint _tmp44_ = 0;
#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp44_ = i;
#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
i = _tmp44_ + 1;
-#line 12142 "BatchImport.c"
+#line 12147 "BatchImport.c"
}
#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp43_ = FALSE;
@@ -12161,7 +12166,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
if (!(_tmp45_ < _tmp48_)) {
#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 12158 "BatchImport.c"
+#line 12163 "BatchImport.c"
}
#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp49_ = sorted;
@@ -12203,7 +12208,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_g_free0 (name);
#line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 12200 "BatchImport.c"
+#line 12205 "BatchImport.c"
}
#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp59_ = raw_file_format_properties_get_instance ();
@@ -12219,14 +12224,14 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_photo_file_format_properties_unref0 (_tmp60_);
#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp63_) {
-#line 12216 "BatchImport.c"
+#line 12221 "BatchImport.c"
gboolean _tmp64_ = FALSE;
gint _tmp65_ = 0;
#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp65_ = i;
#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp65_ > 0) {
-#line 12223 "BatchImport.c"
+#line 12228 "BatchImport.c"
FileToPrepare* _tmp66_ = NULL;
GeeList* _tmp67_ = NULL;
gint _tmp68_ = 0;
@@ -12249,15 +12254,15 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_tmp64_ = _tmp71_;
#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
_file_to_prepare_unref0 (_tmp70_);
-#line 12246 "BatchImport.c"
+#line 12251 "BatchImport.c"
} else {
#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp64_ = FALSE;
-#line 12250 "BatchImport.c"
+#line 12255 "BatchImport.c"
}
#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp64_) {
-#line 12254 "BatchImport.c"
+#line 12259 "BatchImport.c"
FileToPrepare* associated_file = NULL;
GeeList* _tmp72_ = NULL;
gint _tmp73_ = 0;
@@ -12288,7 +12293,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
file_to_prepare_set_associated (_tmp77_, _tmp78_);
#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
_file_to_prepare_unref0 (associated_file);
-#line 12285 "BatchImport.c"
+#line 12290 "BatchImport.c"
} else {
gboolean _tmp79_ = FALSE;
gint _tmp80_ = 0;
@@ -12305,7 +12310,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_tmp83_ = _tmp82_;
#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp80_ < (_tmp83_ - 1)) {
-#line 12302 "BatchImport.c"
+#line 12307 "BatchImport.c"
FileToPrepare* _tmp84_ = NULL;
GeeList* _tmp85_ = NULL;
gint _tmp86_ = 0;
@@ -12328,15 +12333,15 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_tmp79_ = _tmp89_;
#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
_file_to_prepare_unref0 (_tmp88_);
-#line 12325 "BatchImport.c"
+#line 12330 "BatchImport.c"
} else {
#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp79_ = FALSE;
-#line 12329 "BatchImport.c"
+#line 12334 "BatchImport.c"
}
#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp79_) {
-#line 12333 "BatchImport.c"
+#line 12338 "BatchImport.c"
FileToPrepare* associated_file = NULL;
GeeList* _tmp90_ = NULL;
gint _tmp91_ = 0;
@@ -12367,7 +12372,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
file_to_prepare_set_associated (_tmp95_, _tmp96_);
#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
_file_to_prepare_unref0 (associated_file);
-#line 12364 "BatchImport.c"
+#line 12369 "BatchImport.c"
}
}
}
@@ -12377,13 +12382,13 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
_g_free0 (ext);
#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (name);
-#line 12374 "BatchImport.c"
+#line 12379 "BatchImport.c"
}
}
}
#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (sorted);
-#line 12380 "BatchImport.c"
+#line 12385 "BatchImport.c"
}
@@ -12447,7 +12452,7 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
result = FALSE;
#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 12444 "BatchImport.c"
+#line 12449 "BatchImport.c"
}
#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp7_ = maybe_paired;
@@ -12493,7 +12498,7 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
_g_free0 (name);
#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 12490 "BatchImport.c"
+#line 12495 "BatchImport.c"
}
#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp17_ = raw;
@@ -12529,7 +12534,7 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
_g_free0 (name);
#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 12526 "BatchImport.c"
+#line 12531 "BatchImport.c"
}
@@ -12565,7 +12570,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_tmp4_ = determined_size;
#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp4_) {
-#line 12562 "BatchImport.c"
+#line 12567 "BatchImport.c"
guint64 _tmp5_ = 0ULL;
guint64 _tmp6_ = 0ULL;
#line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12574,7 +12579,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_tmp6_ = size;
#line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->total_bytes = _tmp5_ + _tmp6_;
-#line 12571 "BatchImport.c"
+#line 12576 "BatchImport.c"
}
#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp7_ = job;
@@ -12582,7 +12587,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_tmp8_ = batch_import_job_is_directory (_tmp7_);
#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp8_) {
-#line 12579 "BatchImport.c"
+#line 12584 "BatchImport.c"
GFile* dir = NULL;
gboolean copy_to_library = FALSE;
gboolean _tmp9_ = FALSE;
@@ -12614,11 +12619,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_g_object_unref0 (file_or_dir);
#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 12611 "BatchImport.c"
+#line 12616 "BatchImport.c"
}
#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp9_) {
-#line 12615 "BatchImport.c"
+#line 12620 "BatchImport.c"
BatchImportJob* _tmp14_ = NULL;
BatchImportJob* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
@@ -12652,7 +12657,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_g_object_unref0 (file_or_dir);
#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 12649 "BatchImport.c"
+#line 12654 "BatchImport.c"
}
#line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp21_ = dir;
@@ -12660,7 +12665,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_tmp22_ = query_is_directory (_tmp21_);
#line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala"
_vala_assert (_tmp22_, "query_is_directory(dir)");
-#line 12657 "BatchImport.c"
+#line 12662 "BatchImport.c"
{
BatchImportJob* _tmp23_ = NULL;
GFile* _tmp24_ = NULL;
@@ -12675,7 +12680,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
work_sniffer_search_dir (self, _tmp23_, _tmp24_, _tmp25_, &_inner_error_);
#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12672 "BatchImport.c"
+#line 12677 "BatchImport.c"
goto __catch414_g_error;
}
}
@@ -12722,7 +12727,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_g_free0 (_tmp30_);
#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (err);
-#line 12719 "BatchImport.c"
+#line 12724 "BatchImport.c"
}
__finally414:
#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12735,11 +12740,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_g_object_unref0 (file_or_dir);
#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 12732 "BatchImport.c"
+#line 12737 "BatchImport.c"
}
#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (dir);
-#line 12736 "BatchImport.c"
+#line 12741 "BatchImport.c"
} else {
gboolean _tmp35_ = FALSE;
gboolean _tmp43_ = FALSE;
@@ -12753,7 +12758,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_tmp35_ = determined_size;
#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp35_) {
-#line 12750 "BatchImport.c"
+#line 12755 "BatchImport.c"
guint64 _tmp36_ = 0ULL;
GFile* _tmp37_ = NULL;
GCancellable* _tmp38_ = NULL;
@@ -12783,33 +12788,33 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_g_object_unref0 (file_or_dir);
#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 12780 "BatchImport.c"
+#line 12785 "BatchImport.c"
}
#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp42_ = self->total_bytes;
#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->total_bytes = _tmp42_ + _tmp36_;
-#line 12786 "BatchImport.c"
+#line 12791 "BatchImport.c"
}
#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp45_ = file_or_dir;
#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp45_ != NULL) {
-#line 12792 "BatchImport.c"
+#line 12797 "BatchImport.c"
GeeHashSet* _tmp46_ = NULL;
#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp46_ = self->priv->skipset;
#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp44_ = _tmp46_ != NULL;
-#line 12798 "BatchImport.c"
+#line 12803 "BatchImport.c"
} else {
#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp44_ = FALSE;
-#line 12802 "BatchImport.c"
+#line 12807 "BatchImport.c"
}
#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp44_) {
-#line 12806 "BatchImport.c"
+#line 12811 "BatchImport.c"
GeeHashSet* _tmp47_ = NULL;
GFile* _tmp48_ = NULL;
gboolean _tmp49_ = FALSE;
@@ -12821,11 +12826,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_tmp49_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp48_);
#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp43_ = _tmp49_;
-#line 12818 "BatchImport.c"
+#line 12823 "BatchImport.c"
} else {
#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp43_ = FALSE;
-#line 12822 "BatchImport.c"
+#line 12827 "BatchImport.c"
}
#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp43_) {
@@ -12833,7 +12838,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
_g_object_unref0 (file_or_dir);
#line 1568 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 12830 "BatchImport.c"
+#line 12835 "BatchImport.c"
}
#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp50_ = self->files_to_prepare;
@@ -12847,11 +12852,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
_file_to_prepare_unref0 (_tmp53_);
-#line 12844 "BatchImport.c"
+#line 12849 "BatchImport.c"
}
#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (file_or_dir);
-#line 12848 "BatchImport.c"
+#line 12853 "BatchImport.c"
}
@@ -12879,13 +12884,13 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
g_propagate_error (error, _inner_error_);
#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 12876 "BatchImport.c"
+#line 12881 "BatchImport.c"
}
#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
info = NULL;
#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 12882 "BatchImport.c"
+#line 12887 "BatchImport.c"
GFileInfo* _tmp2_ = NULL;
GFileEnumerator* _tmp3_ = NULL;
GCancellable* _tmp4_ = NULL;
@@ -12928,7 +12933,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_g_object_unref0 (enumerator);
#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 12925 "BatchImport.c"
+#line 12930 "BatchImport.c"
}
#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp8_ = _tmp2_;
@@ -12946,7 +12951,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_g_object_unref0 (_tmp2_);
#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 12943 "BatchImport.c"
+#line 12948 "BatchImport.c"
}
#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp10_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
@@ -12956,7 +12961,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_g_object_unref0 (_tmp2_);
#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 12953 "BatchImport.c"
+#line 12958 "BatchImport.c"
}
#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp11_ = dir;
@@ -12978,7 +12983,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_tmp17_ = file_type;
#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp17_ == G_FILE_TYPE_DIRECTORY) {
-#line 12975 "BatchImport.c"
+#line 12980 "BatchImport.c"
GFileInfo* _tmp18_ = NULL;
const gchar* _tmp19_ = NULL;
gboolean _tmp20_ = FALSE;
@@ -12996,7 +13001,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_g_object_unref0 (_tmp2_);
#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 12993 "BatchImport.c"
+#line 12998 "BatchImport.c"
}
{
BatchImportJob* _tmp21_ = NULL;
@@ -13012,7 +13017,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
work_sniffer_search_dir (self, _tmp21_, _tmp22_, _tmp23_, &_inner_error_);
#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13009 "BatchImport.c"
+#line 13014 "BatchImport.c"
goto __catch415_g_error;
}
}
@@ -13059,7 +13064,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_g_free0 (_tmp28_);
#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (err);
-#line 13056 "BatchImport.c"
+#line 13061 "BatchImport.c"
}
__finally415:
#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13076,7 +13081,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_g_object_unref0 (enumerator);
#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 13073 "BatchImport.c"
+#line 13078 "BatchImport.c"
}
} else {
GFileType _tmp33_ = 0;
@@ -13084,7 +13089,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_tmp33_ = file_type;
#line 1598 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp33_ == G_FILE_TYPE_REGULAR) {
-#line 13081 "BatchImport.c"
+#line 13086 "BatchImport.c"
gboolean _tmp34_ = FALSE;
GeeHashSet* _tmp35_ = NULL;
gboolean _tmp39_ = FALSE;
@@ -13095,7 +13100,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_tmp35_ = self->priv->skipset;
#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp35_ != NULL) {
-#line 13092 "BatchImport.c"
+#line 13097 "BatchImport.c"
GeeHashSet* _tmp36_ = NULL;
GFile* _tmp37_ = NULL;
gboolean _tmp38_ = FALSE;
@@ -13107,11 +13112,11 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_tmp38_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_);
#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp34_ = _tmp38_;
-#line 13104 "BatchImport.c"
+#line 13109 "BatchImport.c"
} else {
#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp34_ = FALSE;
-#line 13108 "BatchImport.c"
+#line 13113 "BatchImport.c"
}
#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp34_) {
@@ -13121,7 +13126,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_g_object_unref0 (_tmp2_);
#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 13118 "BatchImport.c"
+#line 13123 "BatchImport.c"
}
#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp41_ = child;
@@ -13129,7 +13134,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_tmp42_ = photo_is_file_image (_tmp41_);
#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp42_) {
-#line 13126 "BatchImport.c"
+#line 13131 "BatchImport.c"
GFile* _tmp43_ = NULL;
gboolean _tmp44_ = FALSE;
#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13138,17 +13143,17 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_tmp44_ = photo_file_format_is_file_supported (_tmp43_);
#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp40_ = _tmp44_;
-#line 13135 "BatchImport.c"
+#line 13140 "BatchImport.c"
} else {
#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp40_ = FALSE;
-#line 13139 "BatchImport.c"
+#line 13144 "BatchImport.c"
}
#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp40_) {
#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp39_ = TRUE;
-#line 13145 "BatchImport.c"
+#line 13150 "BatchImport.c"
} else {
GFile* _tmp45_ = NULL;
gboolean _tmp46_ = FALSE;
@@ -13158,11 +13163,11 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_tmp46_ = video_reader_is_supported_video_file (_tmp45_);
#line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp39_ = _tmp46_;
-#line 13155 "BatchImport.c"
+#line 13160 "BatchImport.c"
}
#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp39_) {
-#line 13159 "BatchImport.c"
+#line 13164 "BatchImport.c"
guint64 _tmp47_ = 0ULL;
GFileInfo* _tmp48_ = NULL;
gint64 _tmp49_ = 0LL;
@@ -13202,7 +13207,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
_g_object_unref0 (_tmp2_);
#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 13199 "BatchImport.c"
+#line 13204 "BatchImport.c"
}
} else {
GFile* _tmp56_ = NULL;
@@ -13221,20 +13226,20 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
g_warning ("BatchImport.vala:1610: Ignoring import of %s file type %d", _tmp58_, (gint) _tmp59_);
#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (_tmp58_);
-#line 13218 "BatchImport.c"
+#line 13223 "BatchImport.c"
}
}
#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (child);
#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_tmp2_);
-#line 13225 "BatchImport.c"
+#line 13230 "BatchImport.c"
}
#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (info);
#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (enumerator);
-#line 13231 "BatchImport.c"
+#line 13236 "BatchImport.c"
}
@@ -13246,8 +13251,8 @@ static void work_sniffer_class_init (WorkSnifferClass * klass) {
#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_class_add_private (klass, sizeof (WorkSnifferPrivate));
#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BackgroundJobClass *) klass)->execute = work_sniffer_real_execute;
-#line 13244 "BatchImport.c"
+ ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) work_sniffer_real_execute;
+#line 13249 "BatchImport.c"
}
@@ -13256,12 +13261,12 @@ static void work_sniffer_instance_init (WorkSniffer * self) {
#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv = WORK_SNIFFER_GET_PRIVATE (self);
#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp0_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, file_to_prepare_unref, NULL, NULL, NULL);
+ _tmp0_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL);
#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->files_to_prepare = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->total_bytes = (guint64) 0;
-#line 13258 "BatchImport.c"
+#line 13263 "BatchImport.c"
}
@@ -13277,7 +13282,7 @@ static void work_sniffer_finalize (BackgroundJob* obj) {
_g_object_unref0 (self->priv->skipset);
#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
BACKGROUND_JOB_CLASS (work_sniffer_parent_class)->finalize (obj);
-#line 13274 "BatchImport.c"
+#line 13279 "BatchImport.c"
}
@@ -13411,21 +13416,21 @@ PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, G
self->is_video = _tmp19_;
#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 13408 "BatchImport.c"
+#line 13413 "BatchImport.c"
}
PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) {
#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
return prepared_file_construct (TYPE_PREPARED_FILE, job, file, associated_file, source_id, dest_id, copy_to_library, exif_md5, thumbnail_md5, full_md5, file_format, filesize, is_video);
-#line 13415 "BatchImport.c"
+#line 13420 "BatchImport.c"
}
static void value_prepared_file_init (GValue* value) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 13422 "BatchImport.c"
+#line 13427 "BatchImport.c"
}
@@ -13434,7 +13439,7 @@ static void value_prepared_file_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
prepared_file_unref (value->data[0].v_pointer);
-#line 13431 "BatchImport.c"
+#line 13436 "BatchImport.c"
}
}
@@ -13444,11 +13449,11 @@ static void value_prepared_file_copy_value (const GValue* src_value, GValue* des
if (src_value->data[0].v_pointer) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = prepared_file_ref (src_value->data[0].v_pointer);
-#line 13441 "BatchImport.c"
+#line 13446 "BatchImport.c"
} else {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 13445 "BatchImport.c"
+#line 13450 "BatchImport.c"
}
}
@@ -13456,37 +13461,37 @@ static void value_prepared_file_copy_value (const GValue* src_value, GValue* des
static gpointer value_prepared_file_peek_pointer (const GValue* value) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 13453 "BatchImport.c"
+#line 13458 "BatchImport.c"
}
static gchar* value_prepared_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (collect_values[0].v_pointer) {
-#line 13460 "BatchImport.c"
+#line 13465 "BatchImport.c"
PreparedFile* object;
object = collect_values[0].v_pointer;
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (object->parent_instance.g_class == NULL) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13467 "BatchImport.c"
+#line 13472 "BatchImport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.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 13471 "BatchImport.c"
+#line 13476 "BatchImport.c"
}
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = prepared_file_ref (object);
-#line 13475 "BatchImport.c"
+#line 13480 "BatchImport.c"
} else {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 13479 "BatchImport.c"
+#line 13484 "BatchImport.c"
}
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 13483 "BatchImport.c"
+#line 13488 "BatchImport.c"
}
@@ -13497,25 +13502,25 @@ static gchar* value_prepared_file_lcopy_value (const GValue* value, guint n_coll
if (!object_p) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13494 "BatchImport.c"
+#line 13499 "BatchImport.c"
}
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!value->data[0].v_pointer) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = NULL;
-#line 13500 "BatchImport.c"
+#line 13505 "BatchImport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = value->data[0].v_pointer;
-#line 13504 "BatchImport.c"
+#line 13509 "BatchImport.c"
} else {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = prepared_file_ref (value->data[0].v_pointer);
-#line 13508 "BatchImport.c"
+#line 13513 "BatchImport.c"
}
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 13512 "BatchImport.c"
+#line 13517 "BatchImport.c"
}
@@ -13529,7 +13534,7 @@ GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, cons
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
return G_PARAM_SPEC (spec);
-#line 13526 "BatchImport.c"
+#line 13531 "BatchImport.c"
}
@@ -13538,7 +13543,7 @@ gpointer value_get_prepared_file (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE), NULL);
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 13535 "BatchImport.c"
+#line 13540 "BatchImport.c"
}
@@ -13558,17 +13563,17 @@ void value_set_prepared_file (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
prepared_file_ref (value->data[0].v_pointer);
-#line 13555 "BatchImport.c"
+#line 13560 "BatchImport.c"
} else {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 13559 "BatchImport.c"
+#line 13564 "BatchImport.c"
}
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
prepared_file_unref (old);
-#line 13565 "BatchImport.c"
+#line 13570 "BatchImport.c"
}
}
@@ -13587,17 +13592,17 @@ void value_take_prepared_file (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = v_object;
-#line 13584 "BatchImport.c"
+#line 13589 "BatchImport.c"
} else {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 13588 "BatchImport.c"
+#line 13593 "BatchImport.c"
}
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
prepared_file_unref (old);
-#line 13594 "BatchImport.c"
+#line 13599 "BatchImport.c"
}
}
@@ -13607,7 +13612,7 @@ static void prepared_file_class_init (PreparedFileClass * klass) {
prepared_file_parent_class = g_type_class_peek_parent (klass);
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
((PreparedFileClass *) klass)->finalize = prepared_file_finalize;
-#line 13604 "BatchImport.c"
+#line 13609 "BatchImport.c"
}
@@ -13616,7 +13621,7 @@ static void prepared_file_instance_init (PreparedFile * self) {
self->associated_file = NULL;
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->ref_count = 1;
-#line 13613 "BatchImport.c"
+#line 13618 "BatchImport.c"
}
@@ -13642,7 +13647,7 @@ static void prepared_file_finalize (PreparedFile* obj) {
_g_free0 (self->thumbnail_md5);
#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (self->full_md5);
-#line 13639 "BatchImport.c"
+#line 13644 "BatchImport.c"
}
@@ -13667,7 +13672,7 @@ gpointer prepared_file_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
return instance;
-#line 13664 "BatchImport.c"
+#line 13669 "BatchImport.c"
}
@@ -13680,7 +13685,7 @@ void prepared_file_unref (gpointer instance) {
PREPARED_FILE_GET_CLASS (self)->finalize (self);
#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 13677 "BatchImport.c"
+#line 13682 "BatchImport.c"
}
}
@@ -13703,14 +13708,14 @@ PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArra
self->list = _tmp1_;
#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 13700 "BatchImport.c"
+#line 13705 "BatchImport.c"
}
PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list) {
#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
return prepared_file_cluster_construct (TYPE_PREPARED_FILE_CLUSTER, list);
-#line 13707 "BatchImport.c"
+#line 13712 "BatchImport.c"
}
@@ -13719,7 +13724,7 @@ static void prepared_file_cluster_class_init (PreparedFileClusterClass * klass)
prepared_file_cluster_parent_class = g_type_class_peek_parent (klass);
#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
((NotificationObjectClass *) klass)->finalize = prepared_file_cluster_finalize;
-#line 13716 "BatchImport.c"
+#line 13721 "BatchImport.c"
}
@@ -13735,7 +13740,7 @@ static void prepared_file_cluster_finalize (NotificationObject* obj) {
_g_object_unref0 (self->list);
#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
NOTIFICATION_OBJECT_CLASS (prepared_file_cluster_parent_class)->finalize (obj);
-#line 13732 "BatchImport.c"
+#line 13737 "BatchImport.c"
}
@@ -13820,14 +13825,14 @@ PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* ow
background_job_set_notification_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 13817 "BatchImport.c"
+#line 13822 "BatchImport.c"
}
PrepareFilesJob* prepare_files_job_new (BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
return prepare_files_job_construct (TYPE_PREPARE_FILES_JOB, owner, files_to_prepare, notification, notification_target, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 13824 "BatchImport.c"
+#line 13829 "BatchImport.c"
}
@@ -13856,7 +13861,7 @@ static gint prepare_files_job_get_test_variable (const gchar* name) {
if (_tmp5_ == NULL) {
#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp4_ = TRUE;
-#line 13853 "BatchImport.c"
+#line 13858 "BatchImport.c"
} else {
const gchar* _tmp6_ = NULL;
gint _tmp7_ = 0;
@@ -13869,13 +13874,13 @@ static gint prepare_files_job_get_test_variable (const gchar* name) {
_tmp8_ = _tmp7_;
#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp4_ = _tmp8_ == 0;
-#line 13866 "BatchImport.c"
+#line 13871 "BatchImport.c"
}
#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp4_) {
#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = 0;
-#line 13872 "BatchImport.c"
+#line 13877 "BatchImport.c"
} else {
const gchar* _tmp9_ = NULL;
gint _tmp10_ = 0;
@@ -13885,7 +13890,7 @@ static gint prepare_files_job_get_test_variable (const gchar* name) {
_tmp10_ = atoi (_tmp9_);
#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = _tmp10_;
-#line 13882 "BatchImport.c"
+#line 13887 "BatchImport.c"
}
#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = _tmp3_;
@@ -13893,7 +13898,7 @@ static gint prepare_files_job_get_test_variable (const gchar* name) {
_g_free0 (value);
#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 13890 "BatchImport.c"
+#line 13895 "BatchImport.c"
}
@@ -13913,10 +13918,10 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
#line 1692 "/home/jens/Source/shotwell/src/BatchImport.vala"
timer = _tmp0_;
#line 1694 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp1_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, prepared_file_unref, NULL, NULL, NULL);
+ _tmp1_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
#line 1694 "/home/jens/Source/shotwell/src/BatchImport.vala"
list = _tmp1_;
-#line 13913 "BatchImport.c"
+#line 13918 "BatchImport.c"
{
GeeList* _file_to_prepare_list = NULL;
GeeList* _tmp2_ = NULL;
@@ -13944,7 +13949,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_file_to_prepare_index = -1;
#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 13941 "BatchImport.c"
+#line 13946 "BatchImport.c"
gint _tmp7_ = 0;
gint _tmp8_ = 0;
gint _tmp9_ = 0;
@@ -13998,7 +14003,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
if (!(_tmp8_ < _tmp9_)) {
#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 13995 "BatchImport.c"
+#line 14000 "BatchImport.c"
}
#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp10_ = _file_to_prepare_list;
@@ -14016,7 +14021,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_tmp14_ = _result_;
#line 1697 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp14_ != IMPORT_RESULT_SUCCESS) {
-#line 14013 "BatchImport.c"
+#line 14018 "BatchImport.c"
FileToPrepare* _tmp15_ = NULL;
BatchImportJob* _tmp16_ = NULL;
FileToPrepare* _tmp17_ = NULL;
@@ -14060,7 +14065,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_file_to_prepare_unref0 (file_to_prepare);
#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 14057 "BatchImport.c"
+#line 14062 "BatchImport.c"
}
#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp26_ = file_to_prepare;
@@ -14084,7 +14089,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_tmp34_ = _tmp33_->associated;
#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp34_ != NULL) {
-#line 14081 "BatchImport.c"
+#line 14086 "BatchImport.c"
FileToPrepare* _tmp35_ = NULL;
FileToPrepare* _tmp36_ = NULL;
GFile* _tmp37_ = NULL;
@@ -14096,11 +14101,11 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_tmp37_ = _tmp36_->file;
#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp32_ = _tmp37_;
-#line 14093 "BatchImport.c"
+#line 14098 "BatchImport.c"
} else {
#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp32_ = NULL;
-#line 14097 "BatchImport.c"
+#line 14102 "BatchImport.c"
}
#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp38_ = _g_object_ref0 (_tmp32_);
@@ -14116,7 +14121,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_tmp41_ = file;
#line 1710 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp41_ == NULL) {
-#line 14113 "BatchImport.c"
+#line 14118 "BatchImport.c"
BatchImportJob* _tmp42_ = NULL;
GFile* _tmp43_ = NULL;
gboolean _tmp44_ = FALSE;
@@ -14143,14 +14148,14 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_file_to_prepare_unref0 (file_to_prepare);
#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
continue;
-#line 14140 "BatchImport.c"
+#line 14145 "BatchImport.c"
}
}
#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp47_ = associated;
#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp47_ == NULL) {
-#line 14147 "BatchImport.c"
+#line 14152 "BatchImport.c"
FileToPrepare* _tmp48_ = NULL;
FileToPrepare* _tmp49_ = NULL;
#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14159,15 +14164,15 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_tmp49_ = _tmp48_->associated;
#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp46_ = _tmp49_ != NULL;
-#line 14156 "BatchImport.c"
+#line 14161 "BatchImport.c"
} else {
#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp46_ = FALSE;
-#line 14160 "BatchImport.c"
+#line 14165 "BatchImport.c"
}
#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp46_) {
-#line 14164 "BatchImport.c"
+#line 14169 "BatchImport.c"
FileToPrepare* _tmp50_ = NULL;
FileToPrepare* _tmp51_ = NULL;
BatchImportJob* _tmp52_ = NULL;
@@ -14187,7 +14192,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
associated = _tmp53_;
#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala"
copy_to_library = _tmp54_;
-#line 14184 "BatchImport.c"
+#line 14189 "BatchImport.c"
}
#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp55_ = job;
@@ -14209,7 +14214,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_tmp61_ = _result_;
#line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp61_ == IMPORT_RESULT_SUCCESS) {
-#line 14206 "BatchImport.c"
+#line 14211 "BatchImport.c"
gint _tmp62_ = 0;
GeeArrayList* _tmp63_ = NULL;
PreparedFile* _tmp64_ = NULL;
@@ -14223,7 +14228,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_tmp64_ = prepared_file;
#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_);
-#line 14220 "BatchImport.c"
+#line 14225 "BatchImport.c"
} else {
BatchImportJob* _tmp65_ = NULL;
GFile* _tmp66_ = NULL;
@@ -14258,19 +14263,19 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_g_free0 (_tmp72_);
#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (_tmp69_);
-#line 14255 "BatchImport.c"
+#line 14260 "BatchImport.c"
}
#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp75_ = list;
#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp77_ = _tmp76_;
#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp77_ >= BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES) {
#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp74_ = TRUE;
-#line 14267 "BatchImport.c"
+#line 14272 "BatchImport.c"
} else {
gboolean _tmp78_ = FALSE;
GTimer* _tmp79_ = NULL;
@@ -14281,31 +14286,31 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_tmp80_ = g_timer_elapsed (_tmp79_, NULL);
#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
if ((_tmp80_ * 1000.0) > ((gdouble) BATCH_IMPORT_REPORT_PREPARED_FILES_EVERY_N_MSEC)) {
-#line 14278 "BatchImport.c"
+#line 14283 "BatchImport.c"
GeeArrayList* _tmp81_ = NULL;
gint _tmp82_ = 0;
gint _tmp83_ = 0;
#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp81_ = list;
#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp82_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp82_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp83_ = _tmp82_;
#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp78_ = _tmp83_ > 0;
-#line 14290 "BatchImport.c"
+#line 14295 "BatchImport.c"
} else {
#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp78_ = FALSE;
-#line 14294 "BatchImport.c"
+#line 14299 "BatchImport.c"
}
#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp74_ = _tmp78_;
-#line 14298 "BatchImport.c"
+#line 14303 "BatchImport.c"
}
#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp74_) {
-#line 14302 "BatchImport.c"
+#line 14307 "BatchImport.c"
PreparedFileCluster* cluster = NULL;
GeeArrayList* _tmp84_ = NULL;
PreparedFileCluster* _tmp85_ = NULL;
@@ -14321,7 +14326,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
cluster = _tmp85_;
#line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp86_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, prepared_file_unref, NULL, NULL, NULL);
+ _tmp86_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
#line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (list);
#line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14340,7 +14345,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
g_timer_start (_tmp89_);
#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
_notification_object_unref0 (cluster);
-#line 14337 "BatchImport.c"
+#line 14342 "BatchImport.c"
}
#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (prepared_file);
@@ -14352,21 +14357,21 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_batch_import_job_unref0 (job);
#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
_file_to_prepare_unref0 (file_to_prepare);
-#line 14349 "BatchImport.c"
+#line 14354 "BatchImport.c"
}
#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_file_to_prepare_list);
-#line 14353 "BatchImport.c"
+#line 14358 "BatchImport.c"
}
#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp90_ = list;
#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp91_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp91_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp92_ = _tmp91_;
#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp92_ > 0) {
-#line 14363 "BatchImport.c"
+#line 14368 "BatchImport.c"
ImportResult _result_ = 0;
ImportResult _tmp93_ = 0;
ImportResult _tmp94_ = 0;
@@ -14378,7 +14383,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_tmp94_ = _result_;
#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp94_ == IMPORT_RESULT_SUCCESS) {
-#line 14375 "BatchImport.c"
+#line 14380 "BatchImport.c"
NotificationCallback _tmp95_ = NULL;
void* _tmp95__target = NULL;
GeeArrayList* _tmp96_ = NULL;
@@ -14398,7 +14403,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp95_, _tmp95__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_NOTIFICATION_OBJECT, NotificationObject));
#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
_notification_object_unref0 (_tmp98_);
-#line 14395 "BatchImport.c"
+#line 14400 "BatchImport.c"
} else {
gint _tmp99_ = 0;
GeeArrayList* _tmp100_ = NULL;
@@ -14413,7 +14418,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp100_ = list;
#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp101_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp101_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp102_ = _tmp101_;
#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14423,12 +14428,12 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp104_ = list;
#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp106_ = _tmp105_;
#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->prepared_files = _tmp103_ - _tmp106_;
-#line 14425 "BatchImport.c"
+#line 14430 "BatchImport.c"
{
GeeArrayList* _prepared_file_list = NULL;
GeeArrayList* _tmp107_ = NULL;
@@ -14447,7 +14452,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp109_ = _prepared_file_list;
#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
- _tmp110_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp110_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp111_ = _tmp110_;
#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14456,7 +14461,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_prepared_file_index = -1;
#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
while (TRUE) {
-#line 14453 "BatchImport.c"
+#line 14458 "BatchImport.c"
gint _tmp112_ = 0;
gint _tmp113_ = 0;
gint _tmp114_ = 0;
@@ -14489,7 +14494,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
if (!(_tmp113_ < _tmp114_)) {
#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
break;
-#line 14486 "BatchImport.c"
+#line 14491 "BatchImport.c"
}
#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp115_ = _prepared_file_list;
@@ -14533,11 +14538,11 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_g_free0 (_tmp125_);
#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (prepared_file);
-#line 14530 "BatchImport.c"
+#line 14535 "BatchImport.c"
}
#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_prepared_file_list);
-#line 14534 "BatchImport.c"
+#line 14539 "BatchImport.c"
}
}
}
@@ -14545,7 +14550,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
_g_object_unref0 (list);
#line 1691 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_timer_destroy0 (timer);
-#line 14542 "BatchImport.c"
+#line 14547 "BatchImport.c"
}
@@ -14558,7 +14563,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), FALSE);
#line 1760 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), FALSE);
-#line 14555 "BatchImport.c"
+#line 14560 "BatchImport.c"
{
gboolean _tmp0_ = FALSE;
BatchImportJob* _tmp1_ = NULL;
@@ -14579,12 +14584,12 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
_tmp0_ = _tmp4_;
#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14576 "BatchImport.c"
+#line 14581 "BatchImport.c"
goto __catch416_g_error;
}
#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp0_) {
-#line 14581 "BatchImport.c"
+#line 14586 "BatchImport.c"
BatchImportJob* _tmp5_ = NULL;
BatchImportJob* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
@@ -14618,21 +14623,21 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
if (file) {
#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
*file = _vala_file;
-#line 14615 "BatchImport.c"
+#line 14620 "BatchImport.c"
} else {
#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_vala_file);
-#line 14619 "BatchImport.c"
+#line 14624 "BatchImport.c"
}
#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (copy_to_library) {
#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
*copy_to_library = _vala_copy_to_library;
-#line 14625 "BatchImport.c"
+#line 14630 "BatchImport.c"
}
#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 14629 "BatchImport.c"
+#line 14634 "BatchImport.c"
}
}
goto __finally416;
@@ -14681,32 +14686,34 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
if (file) {
#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
*file = _vala_file;
-#line 14678 "BatchImport.c"
+#line 14683 "BatchImport.c"
} else {
#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_vala_file);
-#line 14682 "BatchImport.c"
+#line 14687 "BatchImport.c"
}
#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (copy_to_library) {
#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
*copy_to_library = _vala_copy_to_library;
-#line 14688 "BatchImport.c"
+#line 14693 "BatchImport.c"
}
#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 14692 "BatchImport.c"
+#line 14697 "BatchImport.c"
}
__finally416:
#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 14702 "BatchImport.c"
+ gboolean _tmp20_ = FALSE;
#line 1761 "/home/jens/Source/shotwell/src/BatchImport.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 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_clear_error (&_inner_error_);
#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
- return FALSE;
-#line 14703 "BatchImport.c"
+ return _tmp20_;
+#line 14710 "BatchImport.c"
}
#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
result = TRUE;
@@ -14714,21 +14721,21 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
if (file) {
#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
*file = _vala_file;
-#line 14711 "BatchImport.c"
+#line 14718 "BatchImport.c"
} else {
#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_vala_file);
-#line 14715 "BatchImport.c"
+#line 14722 "BatchImport.c"
}
#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (copy_to_library) {
#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
*copy_to_library = _vala_copy_to_library;
-#line 14721 "BatchImport.c"
+#line 14728 "BatchImport.c"
}
#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 14725 "BatchImport.c"
+#line 14732 "BatchImport.c"
}
@@ -14798,7 +14805,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp3_ = is_video;
#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp3_) {
-#line 14795 "BatchImport.c"
+#line 14802 "BatchImport.c"
GFile* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14807,11 +14814,11 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp5_ = photo_is_file_image (_tmp4_);
#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp2_ = !_tmp5_;
-#line 14804 "BatchImport.c"
+#line 14811 "BatchImport.c"
} else {
#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp2_ = FALSE;
-#line 14808 "BatchImport.c"
+#line 14815 "BatchImport.c"
}
#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp2_) {
@@ -14821,21 +14828,21 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
if (prepared_file) {
#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
*prepared_file = _vala_prepared_file;
-#line 14818 "BatchImport.c"
+#line 14825 "BatchImport.c"
} else {
#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_vala_prepared_file);
-#line 14822 "BatchImport.c"
+#line 14829 "BatchImport.c"
}
#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 14826 "BatchImport.c"
+#line 14833 "BatchImport.c"
}
#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp7_ = is_video;
#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp7_) {
-#line 14832 "BatchImport.c"
+#line 14839 "BatchImport.c"
GFile* _tmp8_ = NULL;
gboolean _tmp9_ = FALSE;
#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14844,11 +14851,11 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp9_ = photo_file_format_is_file_supported (_tmp8_);
#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp6_ = !_tmp9_;
-#line 14841 "BatchImport.c"
+#line 14848 "BatchImport.c"
} else {
#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp6_ = FALSE;
-#line 14845 "BatchImport.c"
+#line 14852 "BatchImport.c"
}
#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp6_) {
@@ -14858,15 +14865,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
if (prepared_file) {
#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
*prepared_file = _vala_prepared_file;
-#line 14855 "BatchImport.c"
+#line 14862 "BatchImport.c"
} else {
#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_vala_prepared_file);
-#line 14859 "BatchImport.c"
+#line 14866 "BatchImport.c"
}
#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 14863 "BatchImport.c"
+#line 14870 "BatchImport.c"
}
#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp10_ = self->priv->import_file_count;
@@ -14876,7 +14883,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp11_ = self->priv->fail_every;
#line 1792 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp11_ > 0) {
-#line 14873 "BatchImport.c"
+#line 14880 "BatchImport.c"
gint _tmp12_ = 0;
gint _tmp13_ = 0;
#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14891,22 +14898,22 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
if (prepared_file) {
#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
*prepared_file = _vala_prepared_file;
-#line 14888 "BatchImport.c"
+#line 14895 "BatchImport.c"
} else {
#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_vala_prepared_file);
-#line 14892 "BatchImport.c"
+#line 14899 "BatchImport.c"
}
#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 14896 "BatchImport.c"
+#line 14903 "BatchImport.c"
}
}
#line 1798 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp14_ = self->priv->skip_every;
#line 1798 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp14_ > 0) {
-#line 14903 "BatchImport.c"
+#line 14910 "BatchImport.c"
gint _tmp15_ = 0;
gint _tmp16_ = 0;
#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14921,15 +14928,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
if (prepared_file) {
#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
*prepared_file = _vala_prepared_file;
-#line 14918 "BatchImport.c"
+#line 14925 "BatchImport.c"
} else {
#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_vala_prepared_file);
-#line 14922 "BatchImport.c"
+#line 14929 "BatchImport.c"
}
#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 14926 "BatchImport.c"
+#line 14933 "BatchImport.c"
}
}
#line 1803 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14938,7 +14945,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
thumbnail_md5 = NULL;
#line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala"
full_md5 = NULL;
-#line 14935 "BatchImport.c"
+#line 14942 "BatchImport.c"
{
gchar* _tmp17_ = NULL;
GFile* _tmp18_ = NULL;
@@ -14952,7 +14959,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp17_ = _tmp19_;
#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14949 "BatchImport.c"
+#line 14956 "BatchImport.c"
goto __catch417_g_error;
}
#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14965,7 +14972,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
full_md5 = _tmp20_;
#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (_tmp17_);
-#line 14962 "BatchImport.c"
+#line 14969 "BatchImport.c"
}
goto __finally417;
__catch417_g_error:
@@ -15014,15 +15021,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
if (prepared_file) {
#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
*prepared_file = _vala_prepared_file;
-#line 15011 "BatchImport.c"
+#line 15018 "BatchImport.c"
} else {
#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_vala_prepared_file);
-#line 15015 "BatchImport.c"
+#line 15022 "BatchImport.c"
}
#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 15019 "BatchImport.c"
+#line 15026 "BatchImport.c"
}
__finally417:
#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15039,7 +15046,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
g_clear_error (&_inner_error_);
#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
return 0;
-#line 15036 "BatchImport.c"
+#line 15043 "BatchImport.c"
}
#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp28_ = file;
@@ -15051,7 +15058,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp30_ = is_video;
#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!_tmp30_) {
-#line 15048 "BatchImport.c"
+#line 15055 "BatchImport.c"
PhotoFileFormat _tmp31_ = 0;
PhotoFileReader* reader = NULL;
PhotoFileFormat _tmp35_ = 0;
@@ -15066,7 +15073,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp31_ = file_format;
#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp31_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 15063 "BatchImport.c"
+#line 15070 "BatchImport.c"
GFile* _tmp32_ = NULL;
gchar* _tmp33_ = NULL;
gchar* _tmp34_ = NULL;
@@ -15092,15 +15099,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
if (prepared_file) {
#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
*prepared_file = _vala_prepared_file;
-#line 15089 "BatchImport.c"
+#line 15096 "BatchImport.c"
} else {
#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_vala_prepared_file);
-#line 15093 "BatchImport.c"
+#line 15100 "BatchImport.c"
}
#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 15097 "BatchImport.c"
+#line 15104 "BatchImport.c"
}
#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp35_ = file_format;
@@ -15120,7 +15127,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
reader = _tmp40_;
#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
metadata = NULL;
-#line 15117 "BatchImport.c"
+#line 15124 "BatchImport.c"
{
PhotoMetadata* _tmp41_ = NULL;
PhotoFileReader* _tmp42_ = NULL;
@@ -15134,7 +15141,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp41_ = _tmp43_;
#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15131 "BatchImport.c"
+#line 15138 "BatchImport.c"
goto __catch418_g_error;
}
#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15147,7 +15154,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
metadata = _tmp44_;
#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
_media_metadata_unref0 (_tmp41_);
-#line 15144 "BatchImport.c"
+#line 15151 "BatchImport.c"
}
goto __finally418;
__catch418_g_error:
@@ -15179,7 +15186,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_g_free0 (_tmp47_);
#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (err);
-#line 15175 "BatchImport.c"
+#line 15182 "BatchImport.c"
}
__finally418:
#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15200,13 +15207,13 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
g_clear_error (&_inner_error_);
#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
return 0;
-#line 15196 "BatchImport.c"
+#line 15203 "BatchImport.c"
}
#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp50_ = metadata;
#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp50_ != NULL) {
-#line 15202 "BatchImport.c"
+#line 15209 "BatchImport.c"
guint8* flattened_sans_thumbnail = NULL;
PhotoMetadata* _tmp51_ = NULL;
gint _tmp52_ = 0;
@@ -15241,7 +15248,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp55__length1 = flattened_sans_thumbnail_length1;
#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp55_ != NULL) {
-#line 15237 "BatchImport.c"
+#line 15244 "BatchImport.c"
guint8* _tmp56_ = NULL;
gint _tmp56__length1 = 0;
#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15250,15 +15257,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp56__length1 = flattened_sans_thumbnail_length1;
#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp54_ = _tmp56__length1 > 0;
-#line 15246 "BatchImport.c"
+#line 15253 "BatchImport.c"
} else {
#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp54_ = FALSE;
-#line 15250 "BatchImport.c"
+#line 15257 "BatchImport.c"
}
#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp54_) {
-#line 15254 "BatchImport.c"
+#line 15261 "BatchImport.c"
guint8* _tmp57_ = NULL;
gint _tmp57__length1 = 0;
guint8* _tmp58_ = NULL;
@@ -15278,7 +15285,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_g_free0 (exif_only_md5);
#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
exif_only_md5 = _tmp59_;
-#line 15274 "BatchImport.c"
+#line 15281 "BatchImport.c"
}
#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp60_ = metadata;
@@ -15296,7 +15303,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp64__length1 = flattened_thumbnail_length1;
#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp64_ != NULL) {
-#line 15292 "BatchImport.c"
+#line 15299 "BatchImport.c"
guint8* _tmp65_ = NULL;
gint _tmp65__length1 = 0;
#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15305,15 +15312,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp65__length1 = flattened_thumbnail_length1;
#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp63_ = _tmp65__length1 > 0;
-#line 15301 "BatchImport.c"
+#line 15308 "BatchImport.c"
} else {
#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp63_ = FALSE;
-#line 15305 "BatchImport.c"
+#line 15312 "BatchImport.c"
}
#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp63_) {
-#line 15309 "BatchImport.c"
+#line 15316 "BatchImport.c"
guint8* _tmp66_ = NULL;
gint _tmp66__length1 = 0;
guint8* _tmp67_ = NULL;
@@ -15333,23 +15340,23 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_g_free0 (thumbnail_md5);
#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
thumbnail_md5 = _tmp68_;
-#line 15329 "BatchImport.c"
+#line 15336 "BatchImport.c"
}
#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 15335 "BatchImport.c"
+#line 15342 "BatchImport.c"
}
#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
_media_metadata_unref0 (metadata);
#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
_photo_file_adapter_unref0 (reader);
-#line 15341 "BatchImport.c"
+#line 15348 "BatchImport.c"
}
#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala"
filesize = (guint64) 0;
-#line 15345 "BatchImport.c"
+#line 15352 "BatchImport.c"
{
guint64 _tmp69_ = 0ULL;
GFile* _tmp70_ = NULL;
@@ -15373,12 +15380,12 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp69_ = _tmp74_;
#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15369 "BatchImport.c"
+#line 15376 "BatchImport.c"
goto __catch419_g_error;
}
#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
filesize = _tmp69_;
-#line 15374 "BatchImport.c"
+#line 15381 "BatchImport.c"
}
goto __finally419;
__catch419_g_error:
@@ -15427,15 +15434,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
if (prepared_file) {
#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
*prepared_file = _vala_prepared_file;
-#line 15423 "BatchImport.c"
+#line 15430 "BatchImport.c"
} else {
#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_vala_prepared_file);
-#line 15427 "BatchImport.c"
+#line 15434 "BatchImport.c"
}
#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 15431 "BatchImport.c"
+#line 15438 "BatchImport.c"
}
__finally419:
#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15452,7 +15459,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
g_clear_error (&_inner_error_);
#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
return 0;
-#line 15448 "BatchImport.c"
+#line 15455 "BatchImport.c"
}
#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp82_ = file;
@@ -15466,17 +15473,17 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
_tmp86_ = copy_to_library;
#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp86_) {
-#line 15462 "BatchImport.c"
+#line 15469 "BatchImport.c"
gboolean _tmp87_ = FALSE;
#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp87_ = is_in_library_dir;
#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp85_ = !_tmp87_;
-#line 15468 "BatchImport.c"
+#line 15475 "BatchImport.c"
} else {
#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp85_ = FALSE;
-#line 15472 "BatchImport.c"
+#line 15479 "BatchImport.c"
}
#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp88_ = job;
@@ -15530,15 +15537,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
if (prepared_file) {
#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
*prepared_file = _vala_prepared_file;
-#line 15526 "BatchImport.c"
+#line 15533 "BatchImport.c"
} else {
#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (_vala_prepared_file);
-#line 15530 "BatchImport.c"
+#line 15537 "BatchImport.c"
}
#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 15534 "BatchImport.c"
+#line 15541 "BatchImport.c"
}
@@ -15550,8 +15557,8 @@ static void prepare_files_job_class_init (PrepareFilesJobClass * klass) {
#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_class_add_private (klass, sizeof (PrepareFilesJobPrivate));
#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BackgroundJobClass *) klass)->execute = prepare_files_job_real_execute;
-#line 15547 "BatchImport.c"
+ ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) prepare_files_job_real_execute;
+#line 15554 "BatchImport.c"
}
@@ -15566,7 +15573,7 @@ static void prepare_files_job_instance_init (PrepareFilesJob * self) {
self->priv->fail_every = 0;
#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->priv->skip_every = 0;
-#line 15562 "BatchImport.c"
+#line 15569 "BatchImport.c"
}
@@ -15580,7 +15587,7 @@ static void prepare_files_job_finalize (BackgroundJob* obj) {
_g_object_unref0 (self->priv->library_dir);
#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
BACKGROUND_JOB_CLASS (prepare_files_job_parent_class)->finalize (obj);
-#line 15576 "BatchImport.c"
+#line 15583 "BatchImport.c"
}
@@ -15599,28 +15606,28 @@ GType prepare_files_job_get_type (void) {
static gpointer _prepared_file_ref0 (gpointer self) {
#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? prepared_file_ref (self) : NULL;
-#line 15595 "BatchImport.c"
+#line 15602 "BatchImport.c"
}
static gpointer _batch_import_result_ref0 (gpointer self) {
#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? batch_import_result_ref (self) : NULL;
-#line 15602 "BatchImport.c"
+#line 15609 "BatchImport.c"
}
static gpointer _video_import_params_ref0 (gpointer self) {
#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? video_import_params_ref (self) : NULL;
-#line 15609 "BatchImport.c"
+#line 15616 "BatchImport.c"
}
static gpointer _photo_import_params_ref0 (gpointer self) {
#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? photo_import_params_ref (self) : NULL;
-#line 15616 "BatchImport.c"
+#line 15623 "BatchImport.c"
}
@@ -15658,28 +15665,28 @@ ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file
_tmp1_ = _tmp0_->is_video;
#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_) {
-#line 15654 "BatchImport.c"
+#line 15661 "BatchImport.c"
gboolean _tmp2_ = FALSE;
VideoImportParams* _tmp3_ = NULL;
#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp3_ = video_import_params;
#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp3_ != NULL) {
-#line 15661 "BatchImport.c"
+#line 15668 "BatchImport.c"
PhotoImportParams* _tmp4_ = NULL;
#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp4_ = photo_import_params;
#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp2_ = _tmp4_ == NULL;
-#line 15667 "BatchImport.c"
+#line 15674 "BatchImport.c"
} else {
#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp2_ = FALSE;
-#line 15671 "BatchImport.c"
+#line 15678 "BatchImport.c"
}
#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
_vala_assert (_tmp2_, "(video_import_params != null) && (photo_import_params == null)");
-#line 15675 "BatchImport.c"
+#line 15682 "BatchImport.c"
} else {
gboolean _tmp5_ = FALSE;
VideoImportParams* _tmp6_ = NULL;
@@ -15687,21 +15694,21 @@ ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file
_tmp6_ = video_import_params;
#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp6_ == NULL) {
-#line 15683 "BatchImport.c"
+#line 15690 "BatchImport.c"
PhotoImportParams* _tmp7_ = NULL;
#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp7_ = photo_import_params;
#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp5_ = _tmp7_ != NULL;
-#line 15689 "BatchImport.c"
+#line 15696 "BatchImport.c"
} else {
#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp5_ = FALSE;
-#line 15693 "BatchImport.c"
+#line 15700 "BatchImport.c"
}
#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
_vala_assert (_tmp5_, "(video_import_params == null) && (photo_import_params != null)");
-#line 15697 "BatchImport.c"
+#line 15704 "BatchImport.c"
}
#line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp8_ = final_file;
@@ -15751,14 +15758,14 @@ ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file
self->is_video = _tmp19_;
#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 15747 "BatchImport.c"
+#line 15754 "BatchImport.c"
}
ReadyForImport* ready_for_import_new (GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) {
#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
return ready_for_import_construct (TYPE_READY_FOR_IMPORT, final_file, prepared_file, photo_import_params, video_import_params, batch_result);
-#line 15754 "BatchImport.c"
+#line 15761 "BatchImport.c"
}
@@ -15788,7 +15795,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
_tmp1_ = self->final_file;
#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_ != NULL) {
-#line 15784 "BatchImport.c"
+#line 15791 "BatchImport.c"
GFile* _tmp2_ = NULL;
PreparedFile* _tmp3_ = NULL;
GFile* _tmp4_ = NULL;
@@ -15800,15 +15807,15 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
_tmp4_ = _tmp3_->file;
#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp2_ != _tmp4_;
-#line 15796 "BatchImport.c"
+#line 15803 "BatchImport.c"
} else {
#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = FALSE;
-#line 15800 "BatchImport.c"
+#line 15807 "BatchImport.c"
}
#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp0_) {
-#line 15804 "BatchImport.c"
+#line 15811 "BatchImport.c"
GFile* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
@@ -15822,7 +15829,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
g_debug ("BatchImport.vala:1896: Deleting aborted import copy %s", _tmp7_);
#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (_tmp7_);
-#line 15818 "BatchImport.c"
+#line 15825 "BatchImport.c"
{
GFile* _tmp8_ = NULL;
#line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15831,7 +15838,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
g_file_delete (_tmp8_, NULL, &_inner_error_);
#line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15827 "BatchImport.c"
+#line 15834 "BatchImport.c"
goto __catch420_g_error;
}
}
@@ -15865,7 +15872,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
_g_free0 (_tmp11_);
#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (err);
-#line 15860 "BatchImport.c"
+#line 15867 "BatchImport.c"
}
__finally420:
#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15876,7 +15883,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
g_clear_error (&_inner_error_);
#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 15871 "BatchImport.c"
+#line 15878 "BatchImport.c"
}
}
#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15921,14 +15928,14 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
result = _tmp28_;
#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 15916 "BatchImport.c"
+#line 15923 "BatchImport.c"
}
static gpointer _thumbnails_ref0 (gpointer self) {
#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self ? thumbnails_ref (self) : NULL;
-#line 15923 "BatchImport.c"
+#line 15930 "BatchImport.c"
}
@@ -15943,7 +15950,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
_tmp1_ = self->photo_import_params;
#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp1_ != NULL) {
-#line 15938 "BatchImport.c"
+#line 15945 "BatchImport.c"
PhotoImportParams* _tmp2_ = NULL;
Thumbnails* _tmp3_ = NULL;
#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15952,7 +15959,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
_tmp3_ = _tmp2_->thumbnails;
#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp3_;
-#line 15947 "BatchImport.c"
+#line 15954 "BatchImport.c"
} else {
VideoImportParams* _tmp4_ = NULL;
Thumbnails* _tmp5_ = NULL;
@@ -15962,7 +15969,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
_tmp5_ = _tmp4_->thumbnails;
#line 1914 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp0_ = _tmp5_;
-#line 15957 "BatchImport.c"
+#line 15964 "BatchImport.c"
}
#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp6_ = _thumbnails_ref0 (_tmp0_);
@@ -15970,14 +15977,14 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
result = _tmp6_;
#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
-#line 15965 "BatchImport.c"
+#line 15972 "BatchImport.c"
}
static void value_ready_for_import_init (GValue* value) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 15972 "BatchImport.c"
+#line 15979 "BatchImport.c"
}
@@ -15986,7 +15993,7 @@ static void value_ready_for_import_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
ready_for_import_unref (value->data[0].v_pointer);
-#line 15981 "BatchImport.c"
+#line 15988 "BatchImport.c"
}
}
@@ -15996,11 +16003,11 @@ static void value_ready_for_import_copy_value (const GValue* src_value, GValue*
if (src_value->data[0].v_pointer) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = ready_for_import_ref (src_value->data[0].v_pointer);
-#line 15991 "BatchImport.c"
+#line 15998 "BatchImport.c"
} else {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 15995 "BatchImport.c"
+#line 16002 "BatchImport.c"
}
}
@@ -16008,37 +16015,37 @@ static void value_ready_for_import_copy_value (const GValue* src_value, GValue*
static gpointer value_ready_for_import_peek_pointer (const GValue* value) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 16003 "BatchImport.c"
+#line 16010 "BatchImport.c"
}
static gchar* value_ready_for_import_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (collect_values[0].v_pointer) {
-#line 16010 "BatchImport.c"
+#line 16017 "BatchImport.c"
ReadyForImport* object;
object = collect_values[0].v_pointer;
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (object->parent_instance.g_class == NULL) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16017 "BatchImport.c"
+#line 16024 "BatchImport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.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 16021 "BatchImport.c"
+#line 16028 "BatchImport.c"
}
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = ready_for_import_ref (object);
-#line 16025 "BatchImport.c"
+#line 16032 "BatchImport.c"
} else {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 16029 "BatchImport.c"
+#line 16036 "BatchImport.c"
}
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 16033 "BatchImport.c"
+#line 16040 "BatchImport.c"
}
@@ -16049,25 +16056,25 @@ static gchar* value_ready_for_import_lcopy_value (const GValue* value, guint n_c
if (!object_p) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16044 "BatchImport.c"
+#line 16051 "BatchImport.c"
}
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!value->data[0].v_pointer) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = NULL;
-#line 16050 "BatchImport.c"
+#line 16057 "BatchImport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = value->data[0].v_pointer;
-#line 16054 "BatchImport.c"
+#line 16061 "BatchImport.c"
} else {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = ready_for_import_ref (value->data[0].v_pointer);
-#line 16058 "BatchImport.c"
+#line 16065 "BatchImport.c"
}
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 16062 "BatchImport.c"
+#line 16069 "BatchImport.c"
}
@@ -16081,7 +16088,7 @@ GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, c
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
return G_PARAM_SPEC (spec);
-#line 16076 "BatchImport.c"
+#line 16083 "BatchImport.c"
}
@@ -16090,7 +16097,7 @@ gpointer value_get_ready_for_import (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT), NULL);
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 16085 "BatchImport.c"
+#line 16092 "BatchImport.c"
}
@@ -16110,17 +16117,17 @@ void value_set_ready_for_import (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
ready_for_import_ref (value->data[0].v_pointer);
-#line 16105 "BatchImport.c"
+#line 16112 "BatchImport.c"
} else {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 16109 "BatchImport.c"
+#line 16116 "BatchImport.c"
}
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
ready_for_import_unref (old);
-#line 16115 "BatchImport.c"
+#line 16122 "BatchImport.c"
}
}
@@ -16139,17 +16146,17 @@ void value_take_ready_for_import (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = v_object;
-#line 16134 "BatchImport.c"
+#line 16141 "BatchImport.c"
} else {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 16138 "BatchImport.c"
+#line 16145 "BatchImport.c"
}
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
ready_for_import_unref (old);
-#line 16144 "BatchImport.c"
+#line 16151 "BatchImport.c"
}
}
@@ -16159,14 +16166,14 @@ static void ready_for_import_class_init (ReadyForImportClass * klass) {
ready_for_import_parent_class = g_type_class_peek_parent (klass);
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
((ReadyForImportClass *) klass)->finalize = ready_for_import_finalize;
-#line 16154 "BatchImport.c"
+#line 16161 "BatchImport.c"
}
static void ready_for_import_instance_init (ReadyForImport * self) {
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->ref_count = 1;
-#line 16161 "BatchImport.c"
+#line 16168 "BatchImport.c"
}
@@ -16186,7 +16193,7 @@ static void ready_for_import_finalize (ReadyForImport* obj) {
_video_import_params_unref0 (self->video_import_params);
#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
_batch_import_result_unref0 (self->batch_result);
-#line 16181 "BatchImport.c"
+#line 16188 "BatchImport.c"
}
@@ -16211,7 +16218,7 @@ gpointer ready_for_import_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
return instance;
-#line 16206 "BatchImport.c"
+#line 16213 "BatchImport.c"
}
@@ -16224,7 +16231,7 @@ void ready_for_import_unref (gpointer instance) {
READY_FOR_IMPORT_GET_CLASS (self)->finalize (self);
#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 16219 "BatchImport.c"
+#line 16226 "BatchImport.c"
}
}
@@ -16278,14 +16285,14 @@ PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, Ba
background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 16273 "BatchImport.c"
+#line 16280 "BatchImport.c"
}
PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
return prepared_file_import_job_construct (TYPE_PREPARED_FILE_IMPORT_JOB, owner, prepared_file, import_id, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 16280 "BatchImport.c"
+#line 16287 "BatchImport.c"
}
@@ -16364,7 +16371,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_tmp9_ = _tmp8_->copy_to_library;
#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp9_) {
-#line 16359 "BatchImport.c"
+#line 16366 "BatchImport.c"
{
GFile* _tmp10_ = NULL;
PreparedFile* _tmp11_ = NULL;
@@ -16383,7 +16390,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_tmp10_ = _tmp13_;
#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16378 "BatchImport.c"
+#line 16385 "BatchImport.c"
goto __catch421_g_error;
}
#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16398,7 +16405,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_tmp15_ = final_file;
#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp15_ == NULL) {
-#line 16393 "BatchImport.c"
+#line 16400 "BatchImport.c"
PreparedFile* _tmp16_ = NULL;
BatchImportJob* _tmp17_ = NULL;
PreparedFile* _tmp18_ = NULL;
@@ -16456,13 +16463,13 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_prepared_file_unref0 (prepared_file);
#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 16451 "BatchImport.c"
+#line 16458 "BatchImport.c"
}
#line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp29_ = final_associated_file;
#line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp29_ != NULL) {
-#line 16457 "BatchImport.c"
+#line 16464 "BatchImport.c"
GFile* _tmp30_ = NULL;
PreparedFile* _tmp31_ = NULL;
GFile* _tmp32_ = NULL;
@@ -16480,7 +16487,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_tmp10_);
-#line 16475 "BatchImport.c"
+#line 16482 "BatchImport.c"
goto __catch421_g_error;
}
#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16493,11 +16500,11 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
final_associated_file = _tmp34_;
#line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_tmp30_);
-#line 16488 "BatchImport.c"
+#line 16495 "BatchImport.c"
}
#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (_tmp10_);
-#line 16492 "BatchImport.c"
+#line 16499 "BatchImport.c"
}
goto __finally421;
__catch421_g_error:
@@ -16523,7 +16530,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_tmp36_ = final_file;
#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp36_ != NULL) {
-#line 16518 "BatchImport.c"
+#line 16525 "BatchImport.c"
GFile* _tmp37_ = NULL;
gchar* _tmp38_ = NULL;
#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16534,7 +16541,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_g_free0 (_tmp35_);
#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp35_ = _tmp38_;
-#line 16529 "BatchImport.c"
+#line 16536 "BatchImport.c"
} else {
PreparedFile* _tmp39_ = NULL;
const gchar* _tmp40_ = NULL;
@@ -16549,7 +16556,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_g_free0 (_tmp35_);
#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp35_ = _tmp41_;
-#line 16544 "BatchImport.c"
+#line 16551 "BatchImport.c"
}
#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp42_ = g_strdup (_tmp35_);
@@ -16589,7 +16596,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_prepared_file_unref0 (prepared_file);
#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 16584 "BatchImport.c"
+#line 16591 "BatchImport.c"
}
__finally421:
#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16606,7 +16613,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
g_clear_error (&_inner_error_);
#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 16601 "BatchImport.c"
+#line 16608 "BatchImport.c"
}
}
#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16631,7 +16638,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_tmp55_ = _tmp54_->is_video;
#line 1972 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp55_) {
-#line 16626 "BatchImport.c"
+#line 16633 "BatchImport.c"
GFile* _tmp56_ = NULL;
ImportID _tmp57_ = {0};
PreparedFile* _tmp58_ = NULL;
@@ -16676,7 +16683,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_tmp67_ = video_reader_prepare_for_import (_tmp66_);
#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
_result_ = _tmp67_;
-#line 16671 "BatchImport.c"
+#line 16678 "BatchImport.c"
} else {
GFile* _tmp68_ = NULL;
GFile* _tmp69_ = NULL;
@@ -16728,13 +16735,13 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_tmp81_ = photo_prepare_for_import (_tmp80_);
#line 1983 "/home/jens/Source/shotwell/src/BatchImport.vala"
_result_ = _tmp81_;
-#line 16723 "BatchImport.c"
+#line 16730 "BatchImport.c"
}
#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp83_ = _result_;
#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp83_ != IMPORT_RESULT_SUCCESS) {
-#line 16729 "BatchImport.c"
+#line 16736 "BatchImport.c"
GFile* _tmp84_ = NULL;
PreparedFile* _tmp85_ = NULL;
GFile* _tmp86_ = NULL;
@@ -16746,15 +16753,15 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_tmp86_ = _tmp85_->file;
#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp82_ = _tmp84_ != _tmp86_;
-#line 16741 "BatchImport.c"
+#line 16748 "BatchImport.c"
} else {
#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp82_ = FALSE;
-#line 16745 "BatchImport.c"
+#line 16752 "BatchImport.c"
}
#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp82_) {
-#line 16749 "BatchImport.c"
+#line 16756 "BatchImport.c"
GFile* _tmp87_ = NULL;
gchar* _tmp88_ = NULL;
gchar* _tmp89_ = NULL;
@@ -16768,7 +16775,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
g_debug ("BatchImport.vala:1987: Deleting failed imported copy %s", _tmp89_);
#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_free0 (_tmp89_);
-#line 16763 "BatchImport.c"
+#line 16770 "BatchImport.c"
{
GFile* _tmp90_ = NULL;
#line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16777,7 +16784,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
g_file_delete (_tmp90_, NULL, &_inner_error_);
#line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16772 "BatchImport.c"
+#line 16779 "BatchImport.c"
goto __catch422_g_error;
}
}
@@ -16810,7 +16817,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_g_free0 (_tmp93_);
#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (err);
-#line 16805 "BatchImport.c"
+#line 16812 "BatchImport.c"
}
__finally422:
#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16831,7 +16838,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
g_clear_error (&_inner_error_);
#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 16826 "BatchImport.c"
+#line 16833 "BatchImport.c"
}
}
#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16870,7 +16877,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_tmp109_ = _tmp108_->result;
#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (_tmp109_ != IMPORT_RESULT_SUCCESS) {
-#line 16865 "BatchImport.c"
+#line 16872 "BatchImport.c"
BatchImportResult* _tmp110_ = NULL;
BatchImportResult* _tmp111_ = NULL;
#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16881,7 +16888,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_batch_import_result_unref0 (self->failed);
#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->failed = _tmp111_;
-#line 16876 "BatchImport.c"
+#line 16883 "BatchImport.c"
} else {
GFile* _tmp112_ = NULL;
PreparedFile* _tmp113_ = NULL;
@@ -16905,7 +16912,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_ready_for_import_unref0 (self->ready);
#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->ready = _tmp117_;
-#line 16900 "BatchImport.c"
+#line 16907 "BatchImport.c"
}
#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
_batch_import_result_unref0 (batch_result);
@@ -16919,7 +16926,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
_g_object_unref0 (final_file);
#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
_prepared_file_unref0 (prepared_file);
-#line 16914 "BatchImport.c"
+#line 16921 "BatchImport.c"
}
@@ -16931,8 +16938,8 @@ static void prepared_file_import_job_class_init (PreparedFileImportJobClass * kl
#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_class_add_private (klass, sizeof (PreparedFileImportJobPrivate));
#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BackgroundJobClass *) klass)->execute = prepared_file_import_job_real_execute;
-#line 16927 "BatchImport.c"
+ ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) prepared_file_import_job_real_execute;
+#line 16934 "BatchImport.c"
}
@@ -16943,7 +16950,7 @@ static void prepared_file_import_job_instance_init (PreparedFileImportJob * self
self->ready = NULL;
#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->failed = NULL;
-#line 16938 "BatchImport.c"
+#line 16945 "BatchImport.c"
}
@@ -16959,7 +16966,7 @@ static void prepared_file_import_job_finalize (BackgroundJob* obj) {
_batch_import_result_unref0 (self->failed);
#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
BACKGROUND_JOB_CLASS (prepared_file_import_job_parent_class)->finalize (obj);
-#line 16954 "BatchImport.c"
+#line 16961 "BatchImport.c"
}
@@ -17039,21 +17046,21 @@ CompletedImportObject* completed_import_object_construct (GType object_type, Med
self->user_preview = _tmp9_;
#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 17034 "BatchImport.c"
+#line 17041 "BatchImport.c"
}
CompletedImportObject* completed_import_object_new (MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) {
#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
return completed_import_object_construct (TYPE_COMPLETED_IMPORT_OBJECT, source, thumbnails, original_job, import_result);
-#line 17041 "BatchImport.c"
+#line 17048 "BatchImport.c"
}
static void value_completed_import_object_init (GValue* value) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 17048 "BatchImport.c"
+#line 17055 "BatchImport.c"
}
@@ -17062,7 +17069,7 @@ static void value_completed_import_object_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
completed_import_object_unref (value->data[0].v_pointer);
-#line 17057 "BatchImport.c"
+#line 17064 "BatchImport.c"
}
}
@@ -17072,11 +17079,11 @@ static void value_completed_import_object_copy_value (const GValue* src_value, G
if (src_value->data[0].v_pointer) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = completed_import_object_ref (src_value->data[0].v_pointer);
-#line 17067 "BatchImport.c"
+#line 17074 "BatchImport.c"
} else {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 17071 "BatchImport.c"
+#line 17078 "BatchImport.c"
}
}
@@ -17084,37 +17091,37 @@ static void value_completed_import_object_copy_value (const GValue* src_value, G
static gpointer value_completed_import_object_peek_pointer (const GValue* value) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 17079 "BatchImport.c"
+#line 17086 "BatchImport.c"
}
static gchar* value_completed_import_object_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (collect_values[0].v_pointer) {
-#line 17086 "BatchImport.c"
+#line 17093 "BatchImport.c"
CompletedImportObject* object;
object = collect_values[0].v_pointer;
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (object->parent_instance.g_class == NULL) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 17093 "BatchImport.c"
+#line 17100 "BatchImport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.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 17097 "BatchImport.c"
+#line 17104 "BatchImport.c"
}
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = completed_import_object_ref (object);
-#line 17101 "BatchImport.c"
+#line 17108 "BatchImport.c"
} else {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 17105 "BatchImport.c"
+#line 17112 "BatchImport.c"
}
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 17109 "BatchImport.c"
+#line 17116 "BatchImport.c"
}
@@ -17125,25 +17132,25 @@ static gchar* value_completed_import_object_lcopy_value (const GValue* value, gu
if (!object_p) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 17120 "BatchImport.c"
+#line 17127 "BatchImport.c"
}
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (!value->data[0].v_pointer) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = NULL;
-#line 17126 "BatchImport.c"
+#line 17133 "BatchImport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = value->data[0].v_pointer;
-#line 17130 "BatchImport.c"
+#line 17137 "BatchImport.c"
} else {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
*object_p = completed_import_object_ref (value->data[0].v_pointer);
-#line 17134 "BatchImport.c"
+#line 17141 "BatchImport.c"
}
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
return NULL;
-#line 17138 "BatchImport.c"
+#line 17145 "BatchImport.c"
}
@@ -17157,7 +17164,7 @@ GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar*
G_PARAM_SPEC (spec)->value_type = object_type;
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
return G_PARAM_SPEC (spec);
-#line 17152 "BatchImport.c"
+#line 17159 "BatchImport.c"
}
@@ -17166,7 +17173,7 @@ gpointer value_get_completed_import_object (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT), NULL);
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
return value->data[0].v_pointer;
-#line 17161 "BatchImport.c"
+#line 17168 "BatchImport.c"
}
@@ -17186,17 +17193,17 @@ void value_set_completed_import_object (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
completed_import_object_ref (value->data[0].v_pointer);
-#line 17181 "BatchImport.c"
+#line 17188 "BatchImport.c"
} else {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 17185 "BatchImport.c"
+#line 17192 "BatchImport.c"
}
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
completed_import_object_unref (old);
-#line 17191 "BatchImport.c"
+#line 17198 "BatchImport.c"
}
}
@@ -17215,17 +17222,17 @@ void value_take_completed_import_object (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = v_object;
-#line 17210 "BatchImport.c"
+#line 17217 "BatchImport.c"
} else {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
value->data[0].v_pointer = NULL;
-#line 17214 "BatchImport.c"
+#line 17221 "BatchImport.c"
}
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (old) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
completed_import_object_unref (old);
-#line 17220 "BatchImport.c"
+#line 17227 "BatchImport.c"
}
}
@@ -17235,14 +17242,14 @@ static void completed_import_object_class_init (CompletedImportObjectClass * kla
completed_import_object_parent_class = g_type_class_peek_parent (klass);
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
((CompletedImportObjectClass *) klass)->finalize = completed_import_object_finalize;
-#line 17230 "BatchImport.c"
+#line 17237 "BatchImport.c"
}
static void completed_import_object_instance_init (CompletedImportObject * self) {
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
self->ref_count = 1;
-#line 17237 "BatchImport.c"
+#line 17244 "BatchImport.c"
}
@@ -17262,7 +17269,7 @@ static void completed_import_object_finalize (CompletedImportObject* obj) {
_batch_import_job_unref0 (self->original_job);
#line 2012 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_object_unref0 (self->user_preview);
-#line 17257 "BatchImport.c"
+#line 17264 "BatchImport.c"
}
@@ -17287,7 +17294,7 @@ gpointer completed_import_object_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
return instance;
-#line 17282 "BatchImport.c"
+#line 17289 "BatchImport.c"
}
@@ -17300,7 +17307,7 @@ void completed_import_object_unref (gpointer instance) {
COMPLETED_IMPORT_OBJECT_GET_CLASS (self)->finalize (self);
#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 17295 "BatchImport.c"
+#line 17302 "BatchImport.c"
}
}
@@ -17355,14 +17362,14 @@ ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImpo
background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
return self;
-#line 17350 "BatchImport.c"
+#line 17357 "BatchImport.c"
}
ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) {
#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
return thumbnail_writer_job_construct (TYPE_THUMBNAIL_WRITER_JOB, owner, completed_import_source, callback, callback_target, cancellable, cancel_callback, cancel_callback_target);
-#line 17357 "BatchImport.c"
+#line 17364 "BatchImport.c"
}
@@ -17372,7 +17379,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
GError * _inner_error_ = NULL;
#line 2037 "/home/jens/Source/shotwell/src/BatchImport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob);
-#line 17367 "BatchImport.c"
+#line 17374 "BatchImport.c"
{
CompletedImportObject* _tmp0_ = NULL;
MediaSource* _tmp1_ = NULL;
@@ -17392,7 +17399,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
thumbnail_cache_import_thumbnails (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, TRUE, &_inner_error_);
#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17387 "BatchImport.c"
+#line 17394 "BatchImport.c"
goto __catch423_g_error;
}
#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -17401,7 +17408,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
_tmp5_ = _tmp4_->batch_result;
#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp5_->result = IMPORT_RESULT_SUCCESS;
-#line 17396 "BatchImport.c"
+#line 17403 "BatchImport.c"
}
goto __finally423;
__catch423_g_error:
@@ -17427,7 +17434,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
_tmp7_->result = _tmp9_;
#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
_g_error_free0 (err);
-#line 17422 "BatchImport.c"
+#line 17429 "BatchImport.c"
}
__finally423:
#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -17438,7 +17445,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
g_clear_error (&_inner_error_);
#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
return;
-#line 17433 "BatchImport.c"
+#line 17440 "BatchImport.c"
}
#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp10_ = self->completed_import_source;
@@ -17446,7 +17453,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
_thumbnails_unref0 (_tmp10_->thumbnails);
#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp10_->thumbnails = NULL;
-#line 17441 "BatchImport.c"
+#line 17448 "BatchImport.c"
}
@@ -17456,8 +17463,8 @@ static void thumbnail_writer_job_class_init (ThumbnailWriterJobClass * klass) {
#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
((BackgroundJobClass *) klass)->finalize = thumbnail_writer_job_finalize;
#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
- ((BackgroundJobClass *) klass)->execute = thumbnail_writer_job_real_execute;
-#line 17452 "BatchImport.c"
+ ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) thumbnail_writer_job_real_execute;
+#line 17459 "BatchImport.c"
}
@@ -17473,7 +17480,7 @@ static void thumbnail_writer_job_finalize (BackgroundJob* obj) {
_completed_import_object_unref0 (self->completed_import_source);
#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
BACKGROUND_JOB_CLASS (thumbnail_writer_job_parent_class)->finalize (obj);
-#line 17468 "BatchImport.c"
+#line 17475 "BatchImport.c"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 14:13:20 +0000