summaryrefslogtreecommitdiff
path: root/src/Exporter.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
commitabdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch)
tree26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/Exporter.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parentdd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/Exporter.c')
-rw-r--r--src/Exporter.c955
1 files changed, 472 insertions, 483 deletions
diff --git a/src/Exporter.c b/src/Exporter.c
index 60a528c..b0a15a6 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -1,4 +1,4 @@
-/* Exporter.c generated by valac 0.34.7, the Vala compiler
+/* Exporter.c generated by valac 0.36.6, the Vala compiler
* generated from Exporter.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -442,7 +442,7 @@ GType background_job_get_type (void) G_GNUC_CONST;
static void exporter_on_exported (Exporter* self, BackgroundJob* j);
static GType exporter_export_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
GType background_job_job_priority_get_type (void) G_GNUC_CONST;
-static void _vala_array_add128 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add128 (GFile** * array, int* length, int* size, GFile* value);
static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j);
GFile** exporter_get_exported_files (Exporter* self, int* result_length1);
static GFile** _vala_array_dup30 (GFile** self, int length);
@@ -453,7 +453,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
GType video_source_get_type (void) G_GNUC_CONST;
GType video_get_type (void) G_GNUC_CONST;
gchar* media_source_get_basename (MediaSource* self);
-static void _vala_array_add129 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value);
GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
GFile* app_dirs_get_temp_dir (void);
void app_window_error_message (const gchar* message, GtkWindow* parent);
@@ -479,8 +479,8 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self);
static void exporter_export_job_real_execute (BackgroundJob* base);
void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error);
void video_export (Video* self, GFile* dest_file, GError** error);
-static void exporter_export_job_finalize (BackgroundJob* obj);
-static void exporter_finalize (GObject* obj);
+static void exporter_export_job_finalize (BackgroundJob * obj);
+static void exporter_finalize (GObject * obj);
gpointer exporter_ui_ref (gpointer instance);
void exporter_ui_unref (gpointer instance);
GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -514,7 +514,7 @@ void progress_dialog_close (ProgressDialog* self);
void page_window_set_normal_cursor (PageWindow* self);
GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* affirmative_all, const gchar* title, GtkWindow* parent);
GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining);
-static void exporter_ui_finalize (ExporterUI* obj);
+static void exporter_ui_finalize (ExporterUI * obj);
static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -532,9 +532,9 @@ GType export_format_mode_get_type (void) {
static void export_format_parameters_init (ExportFormatParameters *self, ExportFormatMode mode, PhotoFileFormat specified_format, JpegQuality quality) {
- ExportFormatMode _tmp0_ = 0;
- PhotoFileFormat _tmp1_ = 0;
- JpegQuality _tmp2_ = 0;
+ ExportFormatMode _tmp0_;
+ PhotoFileFormat _tmp1_;
+ JpegQuality _tmp2_;
#line 20 "/home/jens/Source/shotwell/src/Exporter.vala"
memset (self, 0, sizeof (ExportFormatParameters));
#line 22 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -556,7 +556,7 @@ static void export_format_parameters_init (ExportFormatParameters *self, ExportF
void export_format_parameters_current (ExportFormatParameters* result) {
- PhotoFileFormat _tmp0_ = 0;
+ PhotoFileFormat _tmp0_;
ExportFormatParameters _tmp1_ = {0};
#line 29 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp0_ = photo_file_format_get_system_default_format ();
@@ -571,7 +571,7 @@ void export_format_parameters_current (ExportFormatParameters* result) {
void export_format_parameters_unmodified (ExportFormatParameters* result) {
- PhotoFileFormat _tmp0_ = 0;
+ PhotoFileFormat _tmp0_;
ExportFormatParameters _tmp1_ = {0};
#line 34 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp0_ = photo_file_format_get_system_default_format ();
@@ -586,7 +586,7 @@ void export_format_parameters_unmodified (ExportFormatParameters* result) {
void export_format_parameters_for_format (PhotoFileFormat format, ExportFormatParameters* result) {
- PhotoFileFormat _tmp0_ = 0;
+ PhotoFileFormat _tmp0_;
ExportFormatParameters _tmp1_ = {0};
#line 39 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp0_ = format;
@@ -601,7 +601,7 @@ void export_format_parameters_for_format (PhotoFileFormat format, ExportFormatPa
void export_format_parameters_last (ExportFormatParameters* result) {
- PhotoFileFormat _tmp0_ = 0;
+ PhotoFileFormat _tmp0_;
ExportFormatParameters _tmp1_ = {0};
#line 43 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp0_ = photo_file_format_get_system_default_format ();
@@ -616,7 +616,7 @@ void export_format_parameters_last (ExportFormatParameters* result) {
void export_format_parameters_for_JPEG (JpegQuality quality, ExportFormatParameters* result) {
- JpegQuality _tmp0_ = 0;
+ JpegQuality _tmp0_;
ExportFormatParameters _tmp1_ = {0};
#line 48 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp0_ = quality;
@@ -681,13 +681,13 @@ static gpointer _g_object_ref0 (gpointer self) {
Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all) {
Exporter * self = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- Scaling _tmp4_ = {0};
- ExportFormatParameters _tmp5_ = {0};
- gboolean _tmp6_ = FALSE;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
+ Scaling _tmp4_;
+ ExportFormatParameters _tmp5_;
+ gboolean _tmp6_;
#line 122 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (to_export), NULL);
#line 122 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -739,10 +739,10 @@ Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling,
Exporter* exporter_construct_for_temp_file (GType object_type, GeeCollection* to_export, Scaling* scaling, ExportFormatParameters* export_params) {
Exporter * self = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
- Scaling _tmp2_ = {0};
- ExportFormatParameters _tmp3_ = {0};
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
+ Scaling _tmp2_;
+ ExportFormatParameters _tmp3_;
#line 131 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (to_export), NULL);
#line 131 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -783,19 +783,19 @@ Exporter* exporter_new_for_temp_file (GeeCollection* to_export, Scaling* scaling
void exporter_export (Exporter* self, ExporterCompletionCallback completion_callback, void* completion_callback_target, ExporterExportFailedCallback error_callback, void* error_callback_target, ExporterOverwriteCallback overwrite_callback, void* overwrite_callback_target, GCancellable* cancellable, ProgressMonitor monitor, void* monitor_target) {
- ExporterCompletionCallback _tmp0_ = NULL;
- void* _tmp0__target = NULL;
- ExporterExportFailedCallback _tmp1_ = NULL;
- void* _tmp1__target = NULL;
- ExporterOverwriteCallback _tmp2_ = NULL;
- void* _tmp2__target = NULL;
- ProgressMonitor _tmp3_ = NULL;
- void* _tmp3__target = NULL;
+ ExporterCompletionCallback _tmp0_;
+ void* _tmp0__target;
+ ExporterExportFailedCallback _tmp1_;
+ void* _tmp1__target;
+ ExporterOverwriteCallback _tmp2_;
+ void* _tmp2__target;
+ ProgressMonitor _tmp3_;
+ void* _tmp3__target;
GCancellable* _tmp4_ = NULL;
- GCancellable* _tmp5_ = NULL;
- GCancellable* _tmp6_ = NULL;
- GCancellable* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ GCancellable* _tmp5_;
+ GCancellable* _tmp6_;
+ GCancellable* _tmp8_;
+ gboolean _tmp9_;
#line 140 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_if_fail (IS_EXPORTER (self));
#line 140 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -841,7 +841,7 @@ void exporter_export (Exporter* self, ExporterCompletionCallback completion_call
#line 146 "/home/jens/Source/shotwell/src/Exporter.vala"
if (_tmp4_ == NULL) {
#line 844 "Exporter.c"
- GCancellable* _tmp7_ = NULL;
+ GCancellable* _tmp7_;
#line 146 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp7_ = g_cancellable_new ();
#line 146 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -879,7 +879,7 @@ static gpointer _background_job_ref0 (gpointer self) {
}
-static void _vala_array_add128 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add128 (GFile** * array, int* length, int* size, GFile* value) {
#line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
if ((*length) == (*size)) {
#line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -898,19 +898,19 @@ static void _vala_array_add128 (GFile*** array, int* length, int* size, GFile* v
static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
ExporterExportJob* job = NULL;
- BackgroundJob* _tmp0_ = NULL;
- ExporterExportJob* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ BackgroundJob* _tmp0_;
+ ExporterExportJob* _tmp1_;
+ gint _tmp2_;
gboolean completed = FALSE;
- gint _tmp3_ = 0;
- GeeCollection* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
+ gint _tmp3_;
+ GeeCollection* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
gboolean _tmp7_ = FALSE;
- gboolean _tmp8_ = FALSE;
+ gboolean _tmp8_;
gboolean _tmp22_ = FALSE;
- gboolean _tmp23_ = FALSE;
- gboolean _tmp36_ = FALSE;
+ gboolean _tmp23_;
+ gboolean _tmp36_;
#line 152 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_if_fail (IS_EXPORTER (self));
#line 152 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -940,8 +940,8 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
#line 161 "/home/jens/Source/shotwell/src/Exporter.vala"
if (!_tmp8_) {
#line 943 "Exporter.c"
- ExporterExportJob* _tmp9_ = NULL;
- GError* _tmp10_ = NULL;
+ ExporterExportJob* _tmp9_;
+ GError* _tmp10_;
#line 161 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp9_ = job;
#line 161 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -957,17 +957,17 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
#line 161 "/home/jens/Source/shotwell/src/Exporter.vala"
if (_tmp7_) {
#line 960 "Exporter.c"
- ExporterExportFailedCallback _tmp11_ = NULL;
- void* _tmp11__target = NULL;
- ExporterExportJob* _tmp12_ = NULL;
- GFile* _tmp13_ = NULL;
- GeeCollection* _tmp14_ = NULL;
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- gint _tmp17_ = 0;
- ExporterExportJob* _tmp18_ = NULL;
- GError* _tmp19_ = NULL;
- gboolean _tmp20_ = FALSE;
+ ExporterExportFailedCallback _tmp11_;
+ void* _tmp11__target;
+ ExporterExportJob* _tmp12_;
+ GFile* _tmp13_;
+ GeeCollection* _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
+ ExporterExportJob* _tmp18_;
+ GError* _tmp19_;
+ gboolean _tmp20_;
#line 162 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp11_ = self->priv->error_callback;
#line 162 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -993,7 +993,7 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
#line 162 "/home/jens/Source/shotwell/src/Exporter.vala"
if (!_tmp20_) {
#line 996 "Exporter.c"
- gboolean _tmp21_ = FALSE;
+ gboolean _tmp21_;
#line 163 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->aborted = TRUE;
#line 165 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1013,8 +1013,8 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
#line 170 "/home/jens/Source/shotwell/src/Exporter.vala"
if (!_tmp23_) {
#line 1016 "Exporter.c"
- ProgressMonitor _tmp24_ = NULL;
- void* _tmp24__target = NULL;
+ ProgressMonitor _tmp24_;
+ void* _tmp24__target;
#line 170 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp24_ = self->priv->monitor;
#line 170 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1030,13 +1030,13 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
#line 170 "/home/jens/Source/shotwell/src/Exporter.vala"
if (_tmp22_) {
#line 1033 "Exporter.c"
- ProgressMonitor _tmp25_ = NULL;
- void* _tmp25__target = NULL;
- gint _tmp26_ = 0;
- GeeCollection* _tmp27_ = NULL;
- gint _tmp28_ = 0;
- gint _tmp29_ = 0;
- gboolean _tmp30_ = FALSE;
+ ProgressMonitor _tmp25_;
+ void* _tmp25__target;
+ gint _tmp26_;
+ GeeCollection* _tmp27_;
+ gint _tmp28_;
+ gint _tmp29_;
+ gboolean _tmp30_;
#line 171 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp25_ = self->priv->monitor;
#line 171 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1054,7 +1054,7 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
#line 171 "/home/jens/Source/shotwell/src/Exporter.vala"
if (!_tmp30_) {
#line 1057 "Exporter.c"
- gboolean _tmp31_ = FALSE;
+ gboolean _tmp31_;
#line 172 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->aborted = TRUE;
#line 174 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1068,11 +1068,11 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
#line 1069 "Exporter.c"
}
} else {
- GFile** _tmp32_ = NULL;
- gint _tmp32__length1 = 0;
- ExporterExportJob* _tmp33_ = NULL;
- GFile* _tmp34_ = NULL;
- GFile* _tmp35_ = NULL;
+ GFile** _tmp32_;
+ gint _tmp32__length1;
+ ExporterExportJob* _tmp33_;
+ GFile* _tmp34_;
+ GFile* _tmp35_;
#line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp32_ = self->priv->exported_files;
#line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1103,11 +1103,11 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j) {
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- GeeCollection* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
+ GeeCollection* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
#line 185 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_if_fail (IS_EXPORTER (self));
#line 185 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1141,7 +1141,7 @@ static GFile** _vala_array_dup30 (GFile** self, int length) {
#line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
for (i = 0; i < length; i++) {
#line 1144 "Exporter.c"
- GFile* _tmp0_ = NULL;
+ GFile* _tmp0_;
#line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1156,12 +1156,12 @@ static GFile** _vala_array_dup30 (GFile** self, int length) {
GFile** exporter_get_exported_files (Exporter* self, int* result_length1) {
GFile** result = NULL;
- GFile** _tmp0_ = NULL;
- gint _tmp0__length1 = 0;
- GFile** _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- GFile** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
+ GFile** _tmp0_;
+ gint _tmp0__length1;
+ GFile** _tmp1_;
+ gint _tmp1__length1;
+ GFile** _tmp2_;
+ gint _tmp2__length1;
#line 190 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_val_if_fail (IS_EXPORTER (self), NULL);
#line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1190,7 +1190,7 @@ GFile** exporter_get_exported_files (Exporter* self, int* result_length1) {
}
-static void _vala_array_add129 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value) {
#line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
if ((*length) == (*size)) {
#line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1210,7 +1210,7 @@ static void _vala_array_add129 (GFile*** array, int* length, int* size, GFile* v
static gboolean exporter_process_queue (Exporter* self) {
gboolean result = FALSE;
gint submitted = 0;
- gint _tmp90_ = 0;
+ gint _tmp89_;
GError * _inner_error_ = NULL;
#line 194 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_val_if_fail (IS_EXPORTER (self), FALSE);
@@ -1219,8 +1219,8 @@ static gboolean exporter_process_queue (Exporter* self) {
#line 1220 "Exporter.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp0_ = self->priv->to_export;
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1230,38 +1230,38 @@ static gboolean exporter_process_queue (Exporter* self) {
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
while (TRUE) {
#line 1233 "Exporter.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
MediaSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
GFile* use_source_file = NULL;
PhotoFileFormat real_export_format = 0;
- PhotoFileFormat _tmp6_ = 0;
+ PhotoFileFormat _tmp6_;
gchar* basename = NULL;
- MediaSource* _tmp7_ = NULL;
- const gchar* _tmp19_ = NULL;
- GFile* _tmp20_ = NULL;
+ MediaSource* _tmp7_;
+ const gchar* _tmp19_;
+ GFile* _tmp20_;
GFile* export_dir = NULL;
- GFile* _tmp33_ = NULL;
- GFile* _tmp34_ = NULL;
+ GFile* _tmp33_;
+ GFile* _tmp34_;
GFile* dest = NULL;
- GFile* _tmp35_ = NULL;
- Workers* _tmp75_ = NULL;
- MediaSource* _tmp76_ = NULL;
- GFile* _tmp77_ = NULL;
- Scaling _tmp78_ = {0};
- ExportFormatParameters _tmp79_ = {0};
- JpegQuality _tmp80_ = 0;
- PhotoFileFormat _tmp81_ = 0;
- GCancellable* _tmp82_ = NULL;
- ExportFormatParameters _tmp83_ = {0};
- ExportFormatMode _tmp84_ = 0;
- ExportFormatParameters _tmp85_ = {0};
- gboolean _tmp86_ = FALSE;
- ExporterExportJob* _tmp87_ = NULL;
- ExporterExportJob* _tmp88_ = NULL;
- gint _tmp89_ = 0;
+ GFile* _tmp35_;
+ Workers* _tmp74_;
+ MediaSource* _tmp75_;
+ GFile* _tmp76_;
+ Scaling _tmp77_;
+ ExportFormatParameters _tmp78_;
+ JpegQuality _tmp79_;
+ PhotoFileFormat _tmp80_;
+ GCancellable* _tmp81_;
+ ExportFormatParameters _tmp82_;
+ ExportFormatMode _tmp83_;
+ ExportFormatParameters _tmp84_;
+ gboolean _tmp85_;
+ ExporterExportJob* _tmp86_;
+ ExporterExportJob* _tmp87_;
+ gint _tmp88_;
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp2_ = _source_it;
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1292,14 +1292,14 @@ static gboolean exporter_process_queue (Exporter* self) {
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO)) {
#line 1294 "Exporter.c"
Photo* photo = NULL;
- MediaSource* _tmp8_ = NULL;
- Photo* _tmp9_ = NULL;
- Photo* _tmp10_ = NULL;
- ExportFormatParameters _tmp11_ = {0};
- PhotoFileFormat _tmp12_ = 0;
- Photo* _tmp13_ = NULL;
- ExportFormatParameters _tmp14_ = {0};
- gchar* _tmp15_ = NULL;
+ MediaSource* _tmp8_;
+ Photo* _tmp9_;
+ Photo* _tmp10_;
+ ExportFormatParameters _tmp11_;
+ PhotoFileFormat _tmp12_;
+ Photo* _tmp13_;
+ ExportFormatParameters _tmp14_;
+ gchar* _tmp15_;
#line 201 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp8_ = source;
#line 201 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1328,14 +1328,14 @@ static gboolean exporter_process_queue (Exporter* self) {
_g_object_unref0 (photo);
#line 1330 "Exporter.c"
} else {
- MediaSource* _tmp16_ = NULL;
+ MediaSource* _tmp16_;
#line 204 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp16_ = source;
#line 204 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_VIDEO)) {
#line 1337 "Exporter.c"
- MediaSource* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
+ MediaSource* _tmp17_;
+ gchar* _tmp18_;
#line 205 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp17_ = source;
#line 205 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1356,13 +1356,13 @@ static gboolean exporter_process_queue (Exporter* self) {
#line 209 "/home/jens/Source/shotwell/src/Exporter.vala"
if (_tmp20_ != NULL) {
#line 1359 "Exporter.c"
- GFile** _tmp21_ = NULL;
- gint _tmp21__length1 = 0;
- GFile* _tmp22_ = NULL;
- GFile* _tmp23_ = NULL;
- gint _tmp24_ = 0;
- ProgressMonitor _tmp25_ = NULL;
- void* _tmp25__target = NULL;
+ GFile** _tmp21_;
+ gint _tmp21__length1;
+ GFile* _tmp22_;
+ GFile* _tmp23_;
+ gint _tmp24_;
+ ProgressMonitor _tmp25_;
+ void* _tmp25__target;
#line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp21_ = self->priv->exported_files;
#line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1384,13 +1384,13 @@ static gboolean exporter_process_queue (Exporter* self) {
#line 213 "/home/jens/Source/shotwell/src/Exporter.vala"
if (_tmp25_ != NULL) {
#line 1387 "Exporter.c"
- ProgressMonitor _tmp26_ = NULL;
- void* _tmp26__target = NULL;
- gint _tmp27_ = 0;
- GeeCollection* _tmp28_ = NULL;
- gint _tmp29_ = 0;
- gint _tmp30_ = 0;
- gboolean _tmp31_ = FALSE;
+ ProgressMonitor _tmp26_;
+ void* _tmp26__target;
+ gint _tmp27_;
+ GeeCollection* _tmp28_;
+ gint _tmp29_;
+ gint _tmp30_;
+ gboolean _tmp31_;
#line 214 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp26_ = self->priv->monitor;
#line 214 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1408,7 +1408,7 @@ static gboolean exporter_process_queue (Exporter* self) {
#line 214 "/home/jens/Source/shotwell/src/Exporter.vala"
if (!_tmp31_) {
#line 1411 "Exporter.c"
- GCancellable* _tmp32_ = NULL;
+ GCancellable* _tmp32_;
#line 215 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp32_ = self->priv->cancellable;
#line 215 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1454,13 +1454,13 @@ static gboolean exporter_process_queue (Exporter* self) {
{
gboolean collision = FALSE;
GFile* _tmp36_ = NULL;
- GFile* _tmp37_ = NULL;
- GFile* _tmp38_ = NULL;
- const gchar* _tmp39_ = NULL;
+ GFile* _tmp37_;
+ GFile* _tmp38_;
+ const gchar* _tmp39_;
gboolean _tmp40_ = FALSE;
- GFile* _tmp41_ = NULL;
- GFile* _tmp42_ = NULL;
- GFile* _tmp43_ = NULL;
+ GFile* _tmp41_;
+ GFile* _tmp42_;
+ GFile* _tmp43_;
#line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp37_ = app_dirs_get_temp_dir ();
#line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1480,7 +1480,7 @@ static gboolean exporter_process_queue (Exporter* self) {
#line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1483 "Exporter.c"
- goto __catch478_g_error;
+ goto __catch479_g_error;
}
#line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp43_ = _tmp36_;
@@ -1494,52 +1494,49 @@ static gboolean exporter_process_queue (Exporter* self) {
_g_object_unref0 (_tmp36_);
#line 1496 "Exporter.c"
}
- goto __finally478;
- __catch478_g_error:
+ goto __finally479;
+ __catch479_g_error:
{
GError* err = NULL;
- const gchar* _tmp44_ = NULL;
- MediaSource* _tmp45_ = NULL;
- GFile* _tmp46_ = NULL;
- GFile* _tmp47_ = NULL;
- gchar* _tmp48_ = NULL;
- gchar* _tmp49_ = NULL;
- GError* _tmp50_ = NULL;
- const gchar* _tmp51_ = NULL;
- gchar* _tmp52_ = NULL;
- gchar* _tmp53_ = NULL;
+ MediaSource* _tmp44_;
+ GFile* _tmp45_;
+ GFile* _tmp46_;
+ gchar* _tmp47_;
+ gchar* _tmp48_;
+ GError* _tmp49_;
+ const gchar* _tmp50_;
+ gchar* _tmp51_;
+ gchar* _tmp52_;
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
err = _inner_error_;
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
_inner_error_ = NULL;
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp44_ = _ ("Unable to generate a temporary file for %s: %s");
+ _tmp44_ = source;
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp45_ = source;
+ _tmp45_ = media_source_get_file (_tmp44_);
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp46_ = media_source_get_file (_tmp45_);
+ _tmp46_ = _tmp45_;
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp47_ = _tmp46_;
+ _tmp47_ = g_file_get_basename (_tmp46_);
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp48_ = g_file_get_basename (_tmp47_);
+ _tmp48_ = _tmp47_;
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp49_ = _tmp48_;
+ _tmp49_ = err;
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp50_ = err;
+ _tmp50_ = _tmp49_->message;
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp51_ = _tmp50_->message;
+ _tmp51_ = g_strdup_printf (_ ("Unable to generate a temporary file for %s: %s"), _tmp48_, _tmp50_);
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp52_ = g_strdup_printf (_tmp44_, _tmp49_, _tmp51_);
+ _tmp52_ = _tmp51_;
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp53_ = _tmp52_;
+ app_window_error_message (_tmp52_, NULL);
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- app_window_error_message (_tmp53_, NULL);
+ _g_free0 (_tmp52_);
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _g_free0 (_tmp53_);
+ _g_free0 (_tmp48_);
#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _g_free0 (_tmp49_);
-#line 232 "/home/jens/Source/shotwell/src/Exporter.vala"
- _g_object_unref0 (_tmp47_);
+ _g_object_unref0 (_tmp46_);
#line 235 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_error_free0 (err);
#line 235 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1554,13 +1551,13 @@ static gboolean exporter_process_queue (Exporter* self) {
_g_object_unref0 (source);
#line 235 "/home/jens/Source/shotwell/src/Exporter.vala"
break;
-#line 1558 "Exporter.c"
+#line 1555 "Exporter.c"
}
- __finally478:
+ __finally479:
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1563 "Exporter.c"
- gboolean _tmp54_ = FALSE;
+#line 1560 "Exporter.c"
+ gboolean _tmp53_ = FALSE;
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (dest);
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1578,88 +1575,88 @@ static gboolean exporter_process_queue (Exporter* self) {
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
g_clear_error (&_inner_error_);
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
- return _tmp54_;
-#line 1583 "Exporter.c"
+ return _tmp53_;
+#line 1580 "Exporter.c"
}
} else {
- GFile* _tmp55_ = NULL;
- const gchar* _tmp56_ = NULL;
- GFile* _tmp57_ = NULL;
- gboolean _tmp58_ = FALSE;
- gboolean _tmp59_ = FALSE;
+ GFile* _tmp54_;
+ const gchar* _tmp55_;
+ GFile* _tmp56_;
+ gboolean _tmp57_ = FALSE;
+ gboolean _tmp58_;
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp55_ = self->priv->dir;
+ _tmp54_ = self->priv->dir;
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp56_ = basename;
+ _tmp55_ = basename;
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp57_ = g_file_get_child (_tmp55_, _tmp56_);
+ _tmp56_ = g_file_get_child (_tmp54_, _tmp55_);
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (dest);
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
- dest = _tmp57_;
+ dest = _tmp56_;
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp59_ = self->priv->replace_all;
+ _tmp58_ = self->priv->replace_all;
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- if (!_tmp59_) {
-#line 1605 "Exporter.c"
- GFile* _tmp60_ = NULL;
- gboolean _tmp61_ = FALSE;
+ if (!_tmp58_) {
+#line 1602 "Exporter.c"
+ GFile* _tmp59_;
+ gboolean _tmp60_;
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp60_ = dest;
+ _tmp59_ = dest;
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp61_ = g_file_query_exists (_tmp60_, NULL);
+ _tmp60_ = g_file_query_exists (_tmp59_, NULL);
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp58_ = _tmp61_;
-#line 1614 "Exporter.c"
+ _tmp57_ = _tmp60_;
+#line 1611 "Exporter.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp58_ = FALSE;
-#line 1618 "Exporter.c"
+ _tmp57_ = FALSE;
+#line 1615 "Exporter.c"
}
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- if (_tmp58_) {
-#line 1622 "Exporter.c"
- ExporterOverwriteCallback _tmp62_ = NULL;
- void* _tmp62__target = NULL;
- GFile* _tmp63_ = NULL;
- ExporterOverwrite _tmp64_ = 0;
+ if (_tmp57_) {
+#line 1619 "Exporter.c"
+ ExporterOverwriteCallback _tmp61_;
+ void* _tmp61__target;
+ GFile* _tmp62_;
+ ExporterOverwrite _tmp63_;
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp62_ = self->priv->overwrite_callback;
+ _tmp61_ = self->priv->overwrite_callback;
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp62__target = self->priv->overwrite_callback_target;
+ _tmp61__target = self->priv->overwrite_callback_target;
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp63_ = dest;
+ _tmp62_ = dest;
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp64_ = _tmp62_ (self, _tmp63_, _tmp62__target);
+ _tmp63_ = _tmp61_ (self, _tmp62_, _tmp61__target);
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- switch (_tmp64_) {
+ switch (_tmp63_) {
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
case EXPORTER_OVERWRITE_YES:
-#line 1639 "Exporter.c"
+#line 1636 "Exporter.c"
{
#line 244 "/home/jens/Source/shotwell/src/Exporter.vala"
break;
-#line 1643 "Exporter.c"
+#line 1640 "Exporter.c"
}
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
case EXPORTER_OVERWRITE_REPLACE_ALL:
-#line 1647 "Exporter.c"
+#line 1644 "Exporter.c"
{
#line 247 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->replace_all = TRUE;
#line 248 "/home/jens/Source/shotwell/src/Exporter.vala"
break;
-#line 1653 "Exporter.c"
+#line 1650 "Exporter.c"
}
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
case EXPORTER_OVERWRITE_CANCEL:
-#line 1657 "Exporter.c"
+#line 1654 "Exporter.c"
{
- GCancellable* _tmp65_ = NULL;
+ GCancellable* _tmp64_;
#line 251 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp65_ = self->priv->cancellable;
+ _tmp64_ = self->priv->cancellable;
#line 251 "/home/jens/Source/shotwell/src/Exporter.vala"
- g_cancellable_cancel (_tmp65_);
+ g_cancellable_cancel (_tmp64_);
#line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
result = FALSE;
#line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1676,56 +1673,56 @@ static gboolean exporter_process_queue (Exporter* self) {
_g_object_unref0 (_source_it);
#line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 1680 "Exporter.c"
+#line 1677 "Exporter.c"
}
default:
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
case EXPORTER_OVERWRITE_NO:
-#line 1685 "Exporter.c"
+#line 1682 "Exporter.c"
{
- gint _tmp66_ = 0;
- ProgressMonitor _tmp67_ = NULL;
- void* _tmp67__target = NULL;
+ gint _tmp65_;
+ ProgressMonitor _tmp66_;
+ void* _tmp66__target;
#line 257 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp66_ = self->priv->completed_count;
+ _tmp65_ = self->priv->completed_count;
#line 257 "/home/jens/Source/shotwell/src/Exporter.vala"
- self->priv->completed_count = _tmp66_ + 1;
+ self->priv->completed_count = _tmp65_ + 1;
#line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp67_ = self->priv->monitor;
+ _tmp66_ = self->priv->monitor;
#line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp67__target = self->priv->monitor_target;
+ _tmp66__target = self->priv->monitor_target;
#line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
- if (_tmp67_ != NULL) {
-#line 1700 "Exporter.c"
- ProgressMonitor _tmp68_ = NULL;
- void* _tmp68__target = NULL;
- gint _tmp69_ = 0;
- GeeCollection* _tmp70_ = NULL;
- gint _tmp71_ = 0;
- gint _tmp72_ = 0;
- gboolean _tmp73_ = FALSE;
+ if (_tmp66_ != NULL) {
+#line 1697 "Exporter.c"
+ ProgressMonitor _tmp67_;
+ void* _tmp67__target;
+ gint _tmp68_;
+ GeeCollection* _tmp69_;
+ gint _tmp70_;
+ gint _tmp71_;
+ gboolean _tmp72_;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp68_ = self->priv->monitor;
+ _tmp67_ = self->priv->monitor;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp68__target = self->priv->monitor_target;
+ _tmp67__target = self->priv->monitor_target;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp69_ = self->priv->completed_count;
+ _tmp68_ = self->priv->completed_count;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp70_ = self->priv->to_export;
+ _tmp69_ = self->priv->to_export;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp71_ = gee_collection_get_size (_tmp70_);
+ _tmp70_ = gee_collection_get_size (_tmp69_);
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp72_ = _tmp71_;
+ _tmp71_ = _tmp70_;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp73_ = _tmp68_ ((guint64) _tmp69_, (guint64) _tmp72_, TRUE, _tmp68__target);
+ _tmp72_ = _tmp67_ ((guint64) _tmp68_, (guint64) _tmp71_, TRUE, _tmp67__target);
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- if (!_tmp73_) {
-#line 1724 "Exporter.c"
- GCancellable* _tmp74_ = NULL;
+ if (!_tmp72_) {
+#line 1721 "Exporter.c"
+ GCancellable* _tmp73_;
#line 260 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp74_ = self->priv->cancellable;
+ _tmp73_ = self->priv->cancellable;
#line 260 "/home/jens/Source/shotwell/src/Exporter.vala"
- g_cancellable_cancel (_tmp74_);
+ g_cancellable_cancel (_tmp73_);
#line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
result = FALSE;
#line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1742,52 +1739,52 @@ static gboolean exporter_process_queue (Exporter* self) {
_g_object_unref0 (_source_it);
#line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 1746 "Exporter.c"
+#line 1743 "Exporter.c"
}
}
#line 266 "/home/jens/Source/shotwell/src/Exporter.vala"
continue;
-#line 1751 "Exporter.c"
+#line 1748 "Exporter.c"
}
}
}
}
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp75_ = self->priv->workers;
+ _tmp74_ = self->priv->workers;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp76_ = source;
+ _tmp75_ = source;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp77_ = dest;
+ _tmp76_ = dest;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp78_ = self->priv->scaling;
+ _tmp77_ = self->priv->scaling;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp79_ = self->priv->export_params;
+ _tmp78_ = self->priv->export_params;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp80_ = _tmp79_.quality;
+ _tmp79_ = _tmp78_.quality;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp81_ = real_export_format;
+ _tmp80_ = real_export_format;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp82_ = self->priv->cancellable;
+ _tmp81_ = self->priv->cancellable;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp83_ = self->priv->export_params;
+ _tmp82_ = self->priv->export_params;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp84_ = _tmp83_.mode;
+ _tmp83_ = _tmp82_.mode;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp85_ = self->priv->export_params;
+ _tmp84_ = self->priv->export_params;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp86_ = _tmp85_.export_metadata;
+ _tmp85_ = _tmp84_.export_metadata;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp87_ = exporter_export_job_new (self, _tmp76_, _tmp77_, &_tmp78_, &_tmp80_, &_tmp81_, _tmp82_, _tmp84_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp86_);
+ _tmp86_ = exporter_export_job_new (self, _tmp75_, _tmp76_, &_tmp77_, &_tmp79_, &_tmp80_, _tmp81_, _tmp83_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp85_);
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp88_ = _tmp87_;
+ _tmp87_ = _tmp86_;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- workers_enqueue (_tmp75_, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_BACKGROUND_JOB, BackgroundJob));
+ workers_enqueue (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_BACKGROUND_JOB, BackgroundJob));
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _background_job_unref0 (_tmp88_);
+ _background_job_unref0 (_tmp87_);
#line 273 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp89_ = submitted;
+ _tmp88_ = submitted;
#line 273 "/home/jens/Source/shotwell/src/Exporter.vala"
- submitted = _tmp89_ + 1;
+ submitted = _tmp88_ + 1;
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (dest);
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1798,26 +1795,26 @@ static gboolean exporter_process_queue (Exporter* self) {
_g_object_unref0 (use_source_file);
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (source);
-#line 1802 "Exporter.c"
+#line 1799 "Exporter.c"
}
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (_source_it);
-#line 1806 "Exporter.c"
+#line 1803 "Exporter.c"
}
#line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp90_ = submitted;
+ _tmp89_ = submitted;
#line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
- result = _tmp90_ > 0;
+ result = _tmp89_ > 0;
#line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 1814 "Exporter.c"
+#line 1811 "Exporter.c"
}
static void exporter_export_completed (Exporter* self, gboolean is_cancelled) {
- ExporterCompletionCallback _tmp0_ = NULL;
- void* _tmp0__target = NULL;
- gboolean _tmp1_ = FALSE;
+ ExporterCompletionCallback _tmp0_;
+ void* _tmp0__target;
+ gboolean _tmp1_;
#line 279 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_if_fail (IS_EXPORTER (self));
#line 280 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1828,28 +1825,28 @@ static void exporter_export_completed (Exporter* self, gboolean is_cancelled) {
_tmp1_ = is_cancelled;
#line 280 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp0_ (self, _tmp1_, _tmp0__target);
-#line 1832 "Exporter.c"
+#line 1829 "Exporter.c"
}
static void _exporter_on_exported_completion_callback (BackgroundJob* job, gpointer self) {
#line 81 "/home/jens/Source/shotwell/src/Exporter.vala"
exporter_on_exported ((Exporter*) self, job);
-#line 1839 "Exporter.c"
+#line 1836 "Exporter.c"
}
static void _exporter_on_export_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
#line 81 "/home/jens/Source/shotwell/src/Exporter.vala"
exporter_on_export_cancelled ((Exporter*) self, job);
-#line 1846 "Exporter.c"
+#line 1843 "Exporter.c"
}
static gpointer _scaling_dup0 (gpointer self) {
#line 87 "/home/jens/Source/shotwell/src/Exporter.vala"
return self ? scaling_dup (self) : NULL;
-#line 1853 "Exporter.c"
+#line 1850 "Exporter.c"
}
@@ -1861,14 +1858,14 @@ static JpegQuality* _jpeg_quality_dup (JpegQuality* self) {
memcpy (dup, self, sizeof (JpegQuality));
#line 88 "/home/jens/Source/shotwell/src/Exporter.vala"
return dup;
-#line 1865 "Exporter.c"
+#line 1862 "Exporter.c"
}
static gpointer __jpeg_quality_dup0 (gpointer self) {
#line 88 "/home/jens/Source/shotwell/src/Exporter.vala"
return self ? _jpeg_quality_dup (self) : NULL;
-#line 1872 "Exporter.c"
+#line 1869 "Exporter.c"
}
@@ -1880,37 +1877,37 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) {
memcpy (dup, self, sizeof (PhotoFileFormat));
#line 89 "/home/jens/Source/shotwell/src/Exporter.vala"
return dup;
-#line 1884 "Exporter.c"
+#line 1881 "Exporter.c"
}
static gpointer __photo_file_format_dup0 (gpointer self) {
#line 89 "/home/jens/Source/shotwell/src/Exporter.vala"
return self ? _photo_file_format_dup (self) : NULL;
-#line 1891 "Exporter.c"
+#line 1888 "Exporter.c"
}
static ExporterExportJob* exporter_export_job_construct (GType object_type, Exporter* owner, MediaSource* media, GFile* dest, Scaling* scaling, JpegQuality* quality, PhotoFileFormat* format, GCancellable* cancellable, gboolean direct_copy_unmodified, gboolean export_metadata) {
ExporterExportJob* self = NULL;
- Exporter* _tmp0_ = NULL;
- Exporter* _tmp1_ = NULL;
- GCancellable* _tmp2_ = NULL;
- Exporter* _tmp3_ = NULL;
+ Exporter* _tmp0_;
+ Exporter* _tmp1_;
+ GCancellable* _tmp2_;
+ Exporter* _tmp3_;
gboolean _tmp4_ = FALSE;
- MediaSource* _tmp5_ = NULL;
- MediaSource* _tmp7_ = NULL;
- MediaSource* _tmp8_ = NULL;
- GFile* _tmp9_ = NULL;
- GFile* _tmp10_ = NULL;
- Scaling* _tmp11_ = NULL;
- Scaling* _tmp12_ = NULL;
- JpegQuality* _tmp13_ = NULL;
- JpegQuality* _tmp14_ = NULL;
- PhotoFileFormat* _tmp15_ = NULL;
- PhotoFileFormat* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
- gboolean _tmp18_ = FALSE;
+ MediaSource* _tmp5_;
+ MediaSource* _tmp7_;
+ MediaSource* _tmp8_;
+ GFile* _tmp9_;
+ GFile* _tmp10_;
+ Scaling* _tmp11_;
+ Scaling* _tmp12_;
+ JpegQuality* _tmp13_;
+ JpegQuality* _tmp14_;
+ PhotoFileFormat* _tmp15_;
+ PhotoFileFormat* _tmp16_;
+ gboolean _tmp17_;
+ gboolean _tmp18_;
#line 78 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_val_if_fail (IS_EXPORTER (owner), NULL);
#line 78 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1935,14 +1932,14 @@ static ExporterExportJob* exporter_export_job_construct (GType object_type, Expo
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) {
#line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp4_ = TRUE;
-#line 1939 "Exporter.c"
+#line 1936 "Exporter.c"
} else {
- MediaSource* _tmp6_ = NULL;
+ MediaSource* _tmp6_;
#line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp6_ = media;
#line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_VIDEO);
-#line 1946 "Exporter.c"
+#line 1943 "Exporter.c"
}
#line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
_vala_assert (_tmp4_, "media is Photo || media is Video");
@@ -1996,21 +1993,21 @@ static ExporterExportJob* exporter_export_job_construct (GType object_type, Expo
self->export_metadata = _tmp18_;
#line 78 "/home/jens/Source/shotwell/src/Exporter.vala"
return self;
-#line 2000 "Exporter.c"
+#line 1997 "Exporter.c"
}
static ExporterExportJob* exporter_export_job_new (Exporter* owner, MediaSource* media, GFile* dest, Scaling* scaling, JpegQuality* quality, PhotoFileFormat* format, GCancellable* cancellable, gboolean direct_copy_unmodified, gboolean export_metadata) {
#line 78 "/home/jens/Source/shotwell/src/Exporter.vala"
return exporter_export_job_construct (EXPORTER_TYPE_EXPORT_JOB, owner, media, dest, scaling, quality, format, cancellable, direct_copy_unmodified, export_metadata);
-#line 2007 "Exporter.c"
+#line 2004 "Exporter.c"
}
static gpointer _g_error_copy0 (gpointer self) {
#line 102 "/home/jens/Source/shotwell/src/Exporter.vala"
return self ? g_error_copy (self) : NULL;
-#line 2014 "Exporter.c"
+#line 2011 "Exporter.c"
}
@@ -2019,22 +2016,22 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
GError * _inner_error_ = NULL;
#line 94 "/home/jens/Source/shotwell/src/Exporter.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EXPORTER_TYPE_EXPORT_JOB, ExporterExportJob);
-#line 2023 "Exporter.c"
+#line 2020 "Exporter.c"
{
- MediaSource* _tmp0_ = NULL;
+ MediaSource* _tmp0_;
#line 96 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp0_ = self->media;
#line 96 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) {
-#line 2030 "Exporter.c"
- MediaSource* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- Scaling* _tmp3_ = NULL;
- JpegQuality* _tmp4_ = NULL;
- PhotoFileFormat* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
- Scaling _tmp8_ = {0};
+#line 2027 "Exporter.c"
+ MediaSource* _tmp1_;
+ GFile* _tmp2_;
+ Scaling* _tmp3_;
+ JpegQuality* _tmp4_;
+ PhotoFileFormat* _tmp5_;
+ gboolean _tmp6_;
+ gboolean _tmp7_;
+ Scaling _tmp8_;
#line 97 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp1_ = self->media;
#line 97 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2055,18 +2052,18 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), _tmp2_, &_tmp8_, *_tmp4_, *_tmp5_, _tmp6_, _tmp7_, &_inner_error_);
#line 97 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2059 "Exporter.c"
- goto __catch479_g_error;
+#line 2056 "Exporter.c"
+ goto __catch480_g_error;
}
} else {
- MediaSource* _tmp9_ = NULL;
+ MediaSource* _tmp9_;
#line 98 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp9_ = self->media;
#line 98 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_VIDEO)) {
-#line 2068 "Exporter.c"
- MediaSource* _tmp10_ = NULL;
- GFile* _tmp11_ = NULL;
+#line 2065 "Exporter.c"
+ MediaSource* _tmp10_;
+ GFile* _tmp11_;
#line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp10_ = self->media;
#line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2075,18 +2072,18 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
video_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_VIDEO, Video), _tmp11_, &_inner_error_);
#line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2079 "Exporter.c"
- goto __catch479_g_error;
+#line 2076 "Exporter.c"
+ goto __catch480_g_error;
}
}
}
}
- goto __finally479;
- __catch479_g_error:
+ goto __finally480;
+ __catch480_g_error:
{
GError* err = NULL;
- GError* _tmp12_ = NULL;
- GError* _tmp13_ = NULL;
+ GError* _tmp12_;
+ GError* _tmp13_;
#line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
err = _inner_error_;
#line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2101,9 +2098,9 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
self->err = _tmp13_;
#line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_error_free0 (err);
-#line 2105 "Exporter.c"
+#line 2102 "Exporter.c"
}
- __finally479:
+ __finally480:
#line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2112,7 +2109,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
g_clear_error (&_inner_error_);
#line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
return;
-#line 2116 "Exporter.c"
+#line 2113 "Exporter.c"
}
}
@@ -2123,8 +2120,8 @@ static void exporter_export_job_class_init (ExporterExportJobClass * klass) {
#line 68 "/home/jens/Source/shotwell/src/Exporter.vala"
((BackgroundJobClass *) klass)->finalize = exporter_export_job_finalize;
#line 68 "/home/jens/Source/shotwell/src/Exporter.vala"
- ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) exporter_export_job_real_execute;
-#line 2128 "Exporter.c"
+ ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) exporter_export_job_real_execute;
+#line 2125 "Exporter.c"
}
@@ -2135,11 +2132,11 @@ static void exporter_export_job_instance_init (ExporterExportJob * self) {
self->direct_copy_unmodified = FALSE;
#line 76 "/home/jens/Source/shotwell/src/Exporter.vala"
self->export_metadata = TRUE;
-#line 2139 "Exporter.c"
+#line 2136 "Exporter.c"
}
-static void exporter_export_job_finalize (BackgroundJob* obj) {
+static void exporter_export_job_finalize (BackgroundJob * obj) {
ExporterExportJob * self;
#line 68 "/home/jens/Source/shotwell/src/Exporter.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EXPORTER_TYPE_EXPORT_JOB, ExporterExportJob);
@@ -2157,7 +2154,7 @@ static void exporter_export_job_finalize (BackgroundJob* obj) {
_g_error_free0 (self->err);
#line 68 "/home/jens/Source/shotwell/src/Exporter.vala"
BACKGROUND_JOB_CLASS (exporter_export_job_parent_class)->finalize (obj);
-#line 2161 "Exporter.c"
+#line 2158 "Exporter.c"
}
@@ -2180,14 +2177,14 @@ static void exporter_class_init (ExporterClass * klass) {
g_type_class_add_private (klass, sizeof (ExporterPrivate));
#line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
G_OBJECT_CLASS (klass)->finalize = exporter_finalize;
-#line 2184 "Exporter.c"
+#line 2181 "Exporter.c"
}
static void exporter_instance_init (Exporter * self) {
- GeeArrayList* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- Workers* _tmp2_ = NULL;
+ GeeArrayList* _tmp0_;
+ guint _tmp1_;
+ Workers* _tmp2_;
#line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv = EXPORTER_GET_PRIVATE (self);
#line 107 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2204,21 +2201,29 @@ static void exporter_instance_init (Exporter * self) {
self->priv->workers = _tmp2_;
#line 113 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->completion_callback = NULL;
+#line 113 "/home/jens/Source/shotwell/src/Exporter.vala"
+ self->priv->completion_callback_target = self;
#line 114 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->error_callback = NULL;
+#line 114 "/home/jens/Source/shotwell/src/Exporter.vala"
+ self->priv->error_callback_target = self;
#line 115 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->overwrite_callback = NULL;
+#line 115 "/home/jens/Source/shotwell/src/Exporter.vala"
+ self->priv->overwrite_callback_target = self;
#line 116 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->monitor = NULL;
+#line 116 "/home/jens/Source/shotwell/src/Exporter.vala"
+ self->priv->monitor_target = self;
#line 118 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->replace_all = FALSE;
#line 119 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->aborted = FALSE;
-#line 2218 "Exporter.c"
+#line 2223 "Exporter.c"
}
-static void exporter_finalize (GObject* obj) {
+static void exporter_finalize (GObject * obj) {
Exporter * self;
#line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORTER, Exporter);
@@ -2234,7 +2239,7 @@ static void exporter_finalize (GObject* obj) {
_g_object_unref0 (self->priv->cancellable);
#line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
G_OBJECT_CLASS (exporter_parent_class)->finalize (obj);
-#line 2238 "Exporter.c"
+#line 2243 "Exporter.c"
}
@@ -2252,8 +2257,8 @@ GType exporter_get_type (void) {
ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter) {
ExporterUI* self = NULL;
- Exporter* _tmp0_ = NULL;
- Exporter* _tmp1_ = NULL;
+ Exporter* _tmp0_;
+ Exporter* _tmp1_;
#line 290 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_val_if_fail (IS_EXPORTER (exporter), NULL);
#line 290 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2268,21 +2273,21 @@ ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter) {
self->priv->exporter = _tmp1_;
#line 290 "/home/jens/Source/shotwell/src/Exporter.vala"
return self;
-#line 2272 "Exporter.c"
+#line 2277 "Exporter.c"
}
ExporterUI* exporter_ui_new (Exporter* exporter) {
#line 290 "/home/jens/Source/shotwell/src/Exporter.vala"
return exporter_ui_construct (TYPE_EXPORTER_UI, exporter);
-#line 2279 "Exporter.c"
+#line 2284 "Exporter.c"
}
static void _exporter_ui_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
#line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
exporter_ui_on_export_completed ((ExporterUI*) self, exporter, is_cancelled);
-#line 2286 "Exporter.c"
+#line 2291 "Exporter.c"
}
@@ -2291,7 +2296,7 @@ static gboolean _exporter_ui_on_export_failed_exporter_export_failed_callback (E
result = exporter_ui_on_export_failed ((ExporterUI*) self, exporter, file, remaining, err);
#line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 2295 "Exporter.c"
+#line 2300 "Exporter.c"
}
@@ -2300,7 +2305,7 @@ static ExporterOverwrite _exporter_ui_on_export_overwrite_exporter_overwrite_cal
result = exporter_ui_on_export_overwrite ((ExporterUI*) self, exporter, file);
#line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 2304 "Exporter.c"
+#line 2309 "Exporter.c"
}
@@ -2309,23 +2314,22 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
#line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 2313 "Exporter.c"
+#line 2318 "Exporter.c"
}
void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target) {
- ExporterCompletionCallback _tmp0_ = NULL;
- void* _tmp0__target = NULL;
- AppWindow* _tmp1_ = NULL;
- AppWindow* _tmp2_ = NULL;
- AppWindow* _tmp3_ = NULL;
- AppWindow* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- GCancellable* _tmp6_ = NULL;
- ProgressDialog* _tmp7_ = NULL;
- Exporter* _tmp8_ = NULL;
- GCancellable* _tmp9_ = NULL;
- ProgressDialog* _tmp10_ = NULL;
+ ExporterCompletionCallback _tmp0_;
+ void* _tmp0__target;
+ AppWindow* _tmp1_;
+ AppWindow* _tmp2_;
+ AppWindow* _tmp3_;
+ AppWindow* _tmp4_;
+ GCancellable* _tmp5_;
+ ProgressDialog* _tmp6_;
+ Exporter* _tmp7_;
+ GCancellable* _tmp8_;
+ ProgressDialog* _tmp9_;
#line 294 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_if_fail (IS_EXPORTER_UI (self));
#line 295 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2349,39 +2353,37 @@ void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion
#line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp4_ = _tmp3_;
#line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp5_ = _ ("Exporting");
-#line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp6_ = self->priv->cancellable;
+ _tmp5_ = self->priv->cancellable;
#line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp7_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), _tmp5_, _tmp6_);
+ _tmp6_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), _ ("Exporting"), _tmp5_);
#line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
- g_object_ref_sink (_tmp7_);
+ g_object_ref_sink (_tmp6_);
#line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (self->priv->progress_dialog);
#line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
- self->priv->progress_dialog = _tmp7_;
+ self->priv->progress_dialog = _tmp6_;
#line 299 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (_tmp4_);
#line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp8_ = self->priv->exporter;
+ _tmp7_ = self->priv->exporter;
#line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp9_ = self->priv->cancellable;
+ _tmp8_ = self->priv->cancellable;
#line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp10_ = self->priv->progress_dialog;
+ _tmp9_ = self->priv->progress_dialog;
#line 300 "/home/jens/Source/shotwell/src/Exporter.vala"
- exporter_export (_tmp8_, _exporter_ui_on_export_completed_exporter_completion_callback, self, _exporter_ui_on_export_failed_exporter_export_failed_callback, self, _exporter_ui_on_export_overwrite_exporter_overwrite_callback, self, _tmp9_, _progress_dialog_monitor_progress_monitor, _tmp10_);
-#line 2374 "Exporter.c"
+ exporter_export (_tmp7_, _exporter_ui_on_export_completed_exporter_completion_callback, self, _exporter_ui_on_export_failed_exporter_export_failed_callback, self, _exporter_ui_on_export_overwrite_exporter_overwrite_callback, self, _tmp8_, _progress_dialog_monitor_progress_monitor, _tmp9_);
+#line 2376 "Exporter.c"
}
static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporter, gboolean is_cancelled) {
- ProgressDialog* _tmp0_ = NULL;
- AppWindow* _tmp2_ = NULL;
- AppWindow* _tmp3_ = NULL;
- ExporterCompletionCallback _tmp4_ = NULL;
- void* _tmp4__target = NULL;
- Exporter* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+ ProgressDialog* _tmp0_;
+ AppWindow* _tmp2_;
+ AppWindow* _tmp3_;
+ ExporterCompletionCallback _tmp4_;
+ void* _tmp4__target;
+ Exporter* _tmp5_;
+ gboolean _tmp6_;
#line 304 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_if_fail (IS_EXPORTER_UI (self));
#line 304 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2390,8 +2392,8 @@ static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporte
_tmp0_ = self->priv->progress_dialog;
#line 305 "/home/jens/Source/shotwell/src/Exporter.vala"
if (_tmp0_ != NULL) {
-#line 2394 "Exporter.c"
- ProgressDialog* _tmp1_ = NULL;
+#line 2396 "Exporter.c"
+ ProgressDialog* _tmp1_;
#line 306 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp1_ = self->priv->progress_dialog;
#line 306 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2400,7 +2402,7 @@ static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporte
_g_object_unref0 (self->priv->progress_dialog);
#line 307 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->progress_dialog = NULL;
-#line 2404 "Exporter.c"
+#line 2406 "Exporter.c"
}
#line 310 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp2_ = app_window_get_instance ();
@@ -2420,29 +2422,24 @@ static void exporter_ui_on_export_completed (ExporterUI* self, Exporter* exporte
_tmp6_ = is_cancelled;
#line 312 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp4_ (_tmp5_, _tmp6_, _tmp4__target);
-#line 2424 "Exporter.c"
+#line 2426 "Exporter.c"
}
static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Exporter* exporter, GFile* file) {
ExporterOverwrite result = 0;
- ProgressDialog* _tmp0_ = NULL;
+ ProgressDialog* _tmp0_;
gchar* question = NULL;
- const gchar* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ GFile* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
GtkResponseType response = 0;
- const gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- GtkResponseType _tmp12_ = 0;
- ProgressDialog* _tmp13_ = NULL;
- GtkResponseType _tmp14_ = 0;
+ const gchar* _tmp6_;
+ GtkResponseType _tmp7_;
+ ProgressDialog* _tmp8_;
+ GtkResponseType _tmp9_;
#line 315 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_val_if_fail (IS_EXPORTER_UI (self), 0);
#line 315 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2454,46 +2451,36 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
#line 316 "/home/jens/Source/shotwell/src/Exporter.vala"
gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), FALSE);
#line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp1_ = _ ("File %s already exists. Replace?");
+ _tmp1_ = file;
#line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp2_ = file;
+ _tmp2_ = g_file_get_basename (_tmp1_);
#line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp3_ = g_file_get_basename (_tmp2_);
-#line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp5_ = g_strdup_printf (_tmp1_, _tmp4_);
+ _tmp4_ = g_strdup_printf (_ ("File %s already exists. Replace?"), _tmp3_);
#line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
- question = _tmp6_;
-#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp7_ = question;
-#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp8_ = _ ("_Skip");
+ question = _tmp5_;
#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp9_ = _ ("_Replace");
+ _tmp6_ = question;
#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp10_ = _ ("Replace _All");
+ _tmp7_ = app_window_negate_affirm_all_cancel_question (_tmp6_, _ ("_Skip"), _ ("_Replace"), _ ("Replace _All"), _ ("Export"), NULL);
#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp11_ = _ ("Export");
-#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp12_ = app_window_negate_affirm_all_cancel_question (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, NULL);
-#line 318 "/home/jens/Source/shotwell/src/Exporter.vala"
- response = _tmp12_;
+ response = _tmp7_;
#line 321 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp13_ = self->priv->progress_dialog;
+ _tmp8_ = self->priv->progress_dialog;
#line 321 "/home/jens/Source/shotwell/src/Exporter.vala"
- gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow), TRUE);
+ gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), TRUE);
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp14_ = response;
+ _tmp9_ = response;
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
- switch (_tmp14_) {
+ switch (_tmp9_) {
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
case GTK_RESPONSE_APPLY:
-#line 2497 "Exporter.c"
+#line 2484 "Exporter.c"
{
#line 325 "/home/jens/Source/shotwell/src/Exporter.vala"
result = EXPORTER_OVERWRITE_REPLACE_ALL;
@@ -2501,11 +2488,11 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
_g_free0 (question);
#line 325 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 2505 "Exporter.c"
+#line 2492 "Exporter.c"
}
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
case GTK_RESPONSE_YES:
-#line 2509 "Exporter.c"
+#line 2496 "Exporter.c"
{
#line 328 "/home/jens/Source/shotwell/src/Exporter.vala"
result = EXPORTER_OVERWRITE_YES;
@@ -2513,11 +2500,11 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
_g_free0 (question);
#line 328 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 2517 "Exporter.c"
+#line 2504 "Exporter.c"
}
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
case GTK_RESPONSE_CANCEL:
-#line 2521 "Exporter.c"
+#line 2508 "Exporter.c"
{
#line 331 "/home/jens/Source/shotwell/src/Exporter.vala"
result = EXPORTER_OVERWRITE_CANCEL;
@@ -2525,12 +2512,12 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
_g_free0 (question);
#line 331 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 2529 "Exporter.c"
+#line 2516 "Exporter.c"
}
default:
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
case GTK_RESPONSE_NO:
-#line 2534 "Exporter.c"
+#line 2521 "Exporter.c"
{
#line 335 "/home/jens/Source/shotwell/src/Exporter.vala"
result = EXPORTER_OVERWRITE_NO;
@@ -2538,20 +2525,20 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
_g_free0 (question);
#line 335 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 2542 "Exporter.c"
+#line 2529 "Exporter.c"
}
}
#line 315 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_free0 (question);
-#line 2547 "Exporter.c"
+#line 2534 "Exporter.c"
}
static gboolean exporter_ui_on_export_failed (ExporterUI* self, Exporter* exporter, GFile* file, gint remaining, GError* err) {
gboolean result = FALSE;
- GFile* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- GtkResponseType _tmp2_ = 0;
+ GFile* _tmp0_;
+ gint _tmp1_;
+ GtkResponseType _tmp2_;
#line 339 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_val_if_fail (IS_EXPORTER_UI (self), FALSE);
#line 339 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2568,14 +2555,14 @@ static gboolean exporter_ui_on_export_failed (ExporterUI* self, Exporter* export
result = _tmp2_ != GTK_RESPONSE_CANCEL;
#line 340 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 2572 "Exporter.c"
+#line 2559 "Exporter.c"
}
static void value_exporter_ui_init (GValue* value) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = NULL;
-#line 2579 "Exporter.c"
+#line 2566 "Exporter.c"
}
@@ -2584,7 +2571,7 @@ static void value_exporter_ui_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
exporter_ui_unref (value->data[0].v_pointer);
-#line 2588 "Exporter.c"
+#line 2575 "Exporter.c"
}
}
@@ -2594,11 +2581,11 @@ static void value_exporter_ui_copy_value (const GValue* src_value, GValue* dest_
if (src_value->data[0].v_pointer) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
dest_value->data[0].v_pointer = exporter_ui_ref (src_value->data[0].v_pointer);
-#line 2598 "Exporter.c"
+#line 2585 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2602 "Exporter.c"
+#line 2589 "Exporter.c"
}
}
@@ -2606,66 +2593,66 @@ static void value_exporter_ui_copy_value (const GValue* src_value, GValue* dest_
static gpointer value_exporter_ui_peek_pointer (const GValue* value) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return value->data[0].v_pointer;
-#line 2610 "Exporter.c"
+#line 2597 "Exporter.c"
}
static gchar* value_exporter_ui_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
if (collect_values[0].v_pointer) {
-#line 2617 "Exporter.c"
- ExporterUI* object;
+#line 2604 "Exporter.c"
+ ExporterUI * object;
object = collect_values[0].v_pointer;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
if (object->parent_instance.g_class == NULL) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2624 "Exporter.c"
+#line 2611 "Exporter.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.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 2628 "Exporter.c"
+#line 2615 "Exporter.c"
}
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = exporter_ui_ref (object);
-#line 2632 "Exporter.c"
+#line 2619 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = NULL;
-#line 2636 "Exporter.c"
+#line 2623 "Exporter.c"
}
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return NULL;
-#line 2640 "Exporter.c"
+#line 2627 "Exporter.c"
}
static gchar* value_exporter_ui_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- ExporterUI** object_p;
+ ExporterUI ** object_p;
object_p = collect_values[0].v_pointer;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
if (!object_p) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2651 "Exporter.c"
+#line 2638 "Exporter.c"
}
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
if (!value->data[0].v_pointer) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
*object_p = NULL;
-#line 2657 "Exporter.c"
+#line 2644 "Exporter.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
*object_p = value->data[0].v_pointer;
-#line 2661 "Exporter.c"
+#line 2648 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
*object_p = exporter_ui_ref (value->data[0].v_pointer);
-#line 2665 "Exporter.c"
+#line 2652 "Exporter.c"
}
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return NULL;
-#line 2669 "Exporter.c"
+#line 2656 "Exporter.c"
}
@@ -2679,7 +2666,7 @@ GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return G_PARAM_SPEC (spec);
-#line 2683 "Exporter.c"
+#line 2670 "Exporter.c"
}
@@ -2688,12 +2675,12 @@ gpointer value_get_exporter_ui (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EXPORTER_UI), NULL);
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return value->data[0].v_pointer;
-#line 2692 "Exporter.c"
+#line 2679 "Exporter.c"
}
void value_set_exporter_ui (GValue* value, gpointer v_object) {
- ExporterUI* old;
+ ExporterUI * old;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EXPORTER_UI));
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2708,23 +2695,23 @@ void value_set_exporter_ui (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
exporter_ui_ref (value->data[0].v_pointer);
-#line 2712 "Exporter.c"
+#line 2699 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = NULL;
-#line 2716 "Exporter.c"
+#line 2703 "Exporter.c"
}
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
if (old) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
exporter_ui_unref (old);
-#line 2722 "Exporter.c"
+#line 2709 "Exporter.c"
}
}
void value_take_exporter_ui (GValue* value, gpointer v_object) {
- ExporterUI* old;
+ ExporterUI * old;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EXPORTER_UI));
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2737,17 +2724,17 @@ void value_take_exporter_ui (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = v_object;
-#line 2741 "Exporter.c"
+#line 2728 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = NULL;
-#line 2745 "Exporter.c"
+#line 2732 "Exporter.c"
}
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
if (old) {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
exporter_ui_unref (old);
-#line 2751 "Exporter.c"
+#line 2738 "Exporter.c"
}
}
@@ -2759,12 +2746,12 @@ static void exporter_ui_class_init (ExporterUIClass * klass) {
((ExporterUIClass *) klass)->finalize = exporter_ui_finalize;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
g_type_class_add_private (klass, sizeof (ExporterUIPrivate));
-#line 2763 "Exporter.c"
+#line 2750 "Exporter.c"
}
static void exporter_ui_instance_init (ExporterUI * self) {
- GCancellable* _tmp0_ = NULL;
+ GCancellable* _tmp0_;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv = EXPORTER_UI_GET_PRIVATE (self);
#line 286 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2775,13 +2762,15 @@ static void exporter_ui_instance_init (ExporterUI * self) {
self->priv->progress_dialog = NULL;
#line 288 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->completion_callback = NULL;
+#line 288 "/home/jens/Source/shotwell/src/Exporter.vala"
+ self->priv->completion_callback_target = self;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
self->ref_count = 1;
-#line 2781 "Exporter.c"
+#line 2770 "Exporter.c"
}
-static void exporter_ui_finalize (ExporterUI* obj) {
+static void exporter_ui_finalize (ExporterUI * obj) {
ExporterUI * self;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORTER_UI, ExporterUI);
@@ -2793,7 +2782,7 @@ static void exporter_ui_finalize (ExporterUI* obj) {
_g_object_unref0 (self->priv->cancellable);
#line 287 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (self->priv->progress_dialog);
-#line 2797 "Exporter.c"
+#line 2786 "Exporter.c"
}
@@ -2812,18 +2801,18 @@ GType exporter_ui_get_type (void) {
gpointer exporter_ui_ref (gpointer instance) {
- ExporterUI* self;
+ ExporterUI * self;
self = instance;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
g_atomic_int_inc (&self->ref_count);
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return instance;
-#line 2822 "Exporter.c"
+#line 2811 "Exporter.c"
}
void exporter_ui_unref (gpointer instance) {
- ExporterUI* self;
+ ExporterUI * self;
self = instance;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2831,7 +2820,7 @@ void exporter_ui_unref (gpointer instance) {
EXPORTER_UI_GET_CLASS (self)->finalize (self);
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2835 "Exporter.c"
+#line 2824 "Exporter.c"
}
}