summaryrefslogtreecommitdiff
path: root/src/Exporter.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/Exporter.c
parenta5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff)
parent9e7cd144725a270e0460b21747619f447ca87684 (diff)
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/Exporter.c')
-rw-r--r--src/Exporter.c376
1 files changed, 189 insertions, 187 deletions
diff --git a/src/Exporter.c b/src/Exporter.c
index bc4c3b1..60a528c 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -1,4 +1,4 @@
-/* Exporter.c generated by valac 0.34.4, the Vala compiler
+/* Exporter.c generated by valac 0.34.7, the Vala compiler
* generated from Exporter.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 _tmp89_ = 0;
+ gint _tmp90_ = 0;
GError * _inner_error_ = NULL;
#line 194 "/home/jens/Source/shotwell/src/Exporter.vala"
g_return_val_if_fail (IS_EXPORTER (self), FALSE);
@@ -1247,21 +1247,21 @@ static gboolean exporter_process_queue (Exporter* self) {
GFile* _tmp34_ = NULL;
GFile* dest = NULL;
GFile* _tmp35_ = NULL;
- Workers* _tmp74_ = NULL;
- MediaSource* _tmp75_ = NULL;
- GFile* _tmp76_ = NULL;
- Scaling _tmp77_ = {0};
- ExportFormatParameters _tmp78_ = {0};
- JpegQuality _tmp79_ = 0;
- PhotoFileFormat _tmp80_ = 0;
- GCancellable* _tmp81_ = NULL;
- ExportFormatParameters _tmp82_ = {0};
- ExportFormatMode _tmp83_ = 0;
- ExportFormatParameters _tmp84_ = {0};
- gboolean _tmp85_ = FALSE;
- ExporterExportJob* _tmp86_ = 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;
- gint _tmp88_ = 0;
+ ExporterExportJob* _tmp88_ = NULL;
+ gint _tmp89_ = 0;
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp2_ = _source_it;
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1559,6 +1559,8 @@ static gboolean exporter_process_queue (Exporter* self) {
__finally478:
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1563 "Exporter.c"
+ gboolean _tmp54_ = FALSE;
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (dest);
#line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1576,88 +1578,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 FALSE;
-#line 1581 "Exporter.c"
+ return _tmp54_;
+#line 1583 "Exporter.c"
}
} else {
- GFile* _tmp54_ = NULL;
- const gchar* _tmp55_ = NULL;
- GFile* _tmp56_ = NULL;
- gboolean _tmp57_ = FALSE;
+ GFile* _tmp55_ = NULL;
+ const gchar* _tmp56_ = NULL;
+ GFile* _tmp57_ = NULL;
gboolean _tmp58_ = FALSE;
+ gboolean _tmp59_ = FALSE;
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp54_ = self->priv->dir;
+ _tmp55_ = self->priv->dir;
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp55_ = basename;
+ _tmp56_ = basename;
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp56_ = g_file_get_child (_tmp54_, _tmp55_);
+ _tmp57_ = g_file_get_child (_tmp55_, _tmp56_);
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (dest);
#line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
- dest = _tmp56_;
+ dest = _tmp57_;
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp58_ = self->priv->replace_all;
+ _tmp59_ = self->priv->replace_all;
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- if (!_tmp58_) {
-#line 1603 "Exporter.c"
- GFile* _tmp59_ = NULL;
- gboolean _tmp60_ = FALSE;
+ if (!_tmp59_) {
+#line 1605 "Exporter.c"
+ GFile* _tmp60_ = NULL;
+ gboolean _tmp61_ = FALSE;
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp59_ = dest;
+ _tmp60_ = dest;
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp60_ = g_file_query_exists (_tmp59_, NULL);
+ _tmp61_ = g_file_query_exists (_tmp60_, NULL);
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp57_ = _tmp60_;
-#line 1612 "Exporter.c"
+ _tmp58_ = _tmp61_;
+#line 1614 "Exporter.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp57_ = FALSE;
-#line 1616 "Exporter.c"
+ _tmp58_ = FALSE;
+#line 1618 "Exporter.c"
}
#line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
- if (_tmp57_) {
-#line 1620 "Exporter.c"
- ExporterOverwriteCallback _tmp61_ = NULL;
- void* _tmp61__target = NULL;
- GFile* _tmp62_ = NULL;
- ExporterOverwrite _tmp63_ = 0;
+ if (_tmp58_) {
+#line 1622 "Exporter.c"
+ ExporterOverwriteCallback _tmp62_ = NULL;
+ void* _tmp62__target = NULL;
+ GFile* _tmp63_ = NULL;
+ ExporterOverwrite _tmp64_ = 0;
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp61_ = self->priv->overwrite_callback;
+ _tmp62_ = self->priv->overwrite_callback;
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp61__target = self->priv->overwrite_callback_target;
+ _tmp62__target = self->priv->overwrite_callback_target;
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp62_ = dest;
+ _tmp63_ = dest;
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp63_ = _tmp61_ (self, _tmp62_, _tmp61__target);
+ _tmp64_ = _tmp62_ (self, _tmp63_, _tmp62__target);
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
- switch (_tmp63_) {
+ switch (_tmp64_) {
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
case EXPORTER_OVERWRITE_YES:
-#line 1637 "Exporter.c"
+#line 1639 "Exporter.c"
{
#line 244 "/home/jens/Source/shotwell/src/Exporter.vala"
break;
-#line 1641 "Exporter.c"
+#line 1643 "Exporter.c"
}
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
case EXPORTER_OVERWRITE_REPLACE_ALL:
-#line 1645 "Exporter.c"
+#line 1647 "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 1651 "Exporter.c"
+#line 1653 "Exporter.c"
}
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
case EXPORTER_OVERWRITE_CANCEL:
-#line 1655 "Exporter.c"
+#line 1657 "Exporter.c"
{
- GCancellable* _tmp64_ = NULL;
+ GCancellable* _tmp65_ = NULL;
#line 251 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp64_ = self->priv->cancellable;
+ _tmp65_ = self->priv->cancellable;
#line 251 "/home/jens/Source/shotwell/src/Exporter.vala"
- g_cancellable_cancel (_tmp64_);
+ g_cancellable_cancel (_tmp65_);
#line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
result = FALSE;
#line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1674,56 +1676,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 1678 "Exporter.c"
+#line 1680 "Exporter.c"
}
default:
#line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
case EXPORTER_OVERWRITE_NO:
-#line 1683 "Exporter.c"
+#line 1685 "Exporter.c"
{
- gint _tmp65_ = 0;
- ProgressMonitor _tmp66_ = NULL;
- void* _tmp66__target = NULL;
+ gint _tmp66_ = 0;
+ ProgressMonitor _tmp67_ = NULL;
+ void* _tmp67__target = NULL;
#line 257 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp65_ = self->priv->completed_count;
+ _tmp66_ = self->priv->completed_count;
#line 257 "/home/jens/Source/shotwell/src/Exporter.vala"
- self->priv->completed_count = _tmp65_ + 1;
+ self->priv->completed_count = _tmp66_ + 1;
#line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp66_ = self->priv->monitor;
+ _tmp67_ = self->priv->monitor;
#line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp66__target = self->priv->monitor_target;
+ _tmp67__target = self->priv->monitor_target;
#line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
- if (_tmp66_ != NULL) {
-#line 1698 "Exporter.c"
- ProgressMonitor _tmp67_ = NULL;
- void* _tmp67__target = NULL;
- gint _tmp68_ = 0;
- GeeCollection* _tmp69_ = NULL;
- gint _tmp70_ = 0;
+ if (_tmp67_ != NULL) {
+#line 1700 "Exporter.c"
+ ProgressMonitor _tmp68_ = NULL;
+ void* _tmp68__target = NULL;
+ gint _tmp69_ = 0;
+ GeeCollection* _tmp70_ = NULL;
gint _tmp71_ = 0;
- gboolean _tmp72_ = FALSE;
+ gint _tmp72_ = 0;
+ gboolean _tmp73_ = FALSE;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp67_ = self->priv->monitor;
+ _tmp68_ = self->priv->monitor;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp67__target = self->priv->monitor_target;
+ _tmp68__target = self->priv->monitor_target;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp68_ = self->priv->completed_count;
+ _tmp69_ = self->priv->completed_count;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp69_ = self->priv->to_export;
+ _tmp70_ = self->priv->to_export;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp70_ = gee_collection_get_size (_tmp69_);
+ _tmp71_ = gee_collection_get_size (_tmp70_);
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp71_ = _tmp70_;
+ _tmp72_ = _tmp71_;
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp72_ = _tmp67_ ((guint64) _tmp68_, (guint64) _tmp71_, TRUE, _tmp67__target);
+ _tmp73_ = _tmp68_ ((guint64) _tmp69_, (guint64) _tmp72_, TRUE, _tmp68__target);
#line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
- if (!_tmp72_) {
-#line 1722 "Exporter.c"
- GCancellable* _tmp73_ = NULL;
+ if (!_tmp73_) {
+#line 1724 "Exporter.c"
+ GCancellable* _tmp74_ = NULL;
#line 260 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp73_ = self->priv->cancellable;
+ _tmp74_ = self->priv->cancellable;
#line 260 "/home/jens/Source/shotwell/src/Exporter.vala"
- g_cancellable_cancel (_tmp73_);
+ g_cancellable_cancel (_tmp74_);
#line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
result = FALSE;
#line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1740,52 +1742,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 1744 "Exporter.c"
+#line 1746 "Exporter.c"
}
}
#line 266 "/home/jens/Source/shotwell/src/Exporter.vala"
continue;
-#line 1749 "Exporter.c"
+#line 1751 "Exporter.c"
}
}
}
}
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp74_ = self->priv->workers;
+ _tmp75_ = self->priv->workers;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp75_ = source;
+ _tmp76_ = source;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp76_ = dest;
+ _tmp77_ = dest;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp77_ = self->priv->scaling;
+ _tmp78_ = self->priv->scaling;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp78_ = self->priv->export_params;
+ _tmp79_ = self->priv->export_params;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp79_ = _tmp78_.quality;
+ _tmp80_ = _tmp79_.quality;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp80_ = real_export_format;
+ _tmp81_ = real_export_format;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp81_ = self->priv->cancellable;
+ _tmp82_ = self->priv->cancellable;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp82_ = self->priv->export_params;
+ _tmp83_ = self->priv->export_params;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp83_ = _tmp82_.mode;
+ _tmp84_ = _tmp83_.mode;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp84_ = self->priv->export_params;
+ _tmp85_ = self->priv->export_params;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp85_ = _tmp84_.export_metadata;
+ _tmp86_ = _tmp85_.export_metadata;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp86_ = exporter_export_job_new (self, _tmp75_, _tmp76_, &_tmp77_, &_tmp79_, &_tmp80_, _tmp81_, _tmp83_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp85_);
+ _tmp87_ = exporter_export_job_new (self, _tmp76_, _tmp77_, &_tmp78_, &_tmp80_, &_tmp81_, _tmp82_, _tmp84_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp86_);
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp87_ = _tmp86_;
+ _tmp88_ = _tmp87_;
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- workers_enqueue (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_BACKGROUND_JOB, BackgroundJob));
+ workers_enqueue (_tmp75_, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_BACKGROUND_JOB, BackgroundJob));
#line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
- _background_job_unref0 (_tmp87_);
+ _background_job_unref0 (_tmp88_);
#line 273 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp88_ = submitted;
+ _tmp89_ = submitted;
#line 273 "/home/jens/Source/shotwell/src/Exporter.vala"
- submitted = _tmp88_ + 1;
+ submitted = _tmp89_ + 1;
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (dest);
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1796,19 +1798,19 @@ 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 1800 "Exporter.c"
+#line 1802 "Exporter.c"
}
#line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_object_unref0 (_source_it);
-#line 1804 "Exporter.c"
+#line 1806 "Exporter.c"
}
#line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
- _tmp89_ = submitted;
+ _tmp90_ = submitted;
#line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
- result = _tmp89_ > 0;
+ result = _tmp90_ > 0;
#line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
return result;
-#line 1812 "Exporter.c"
+#line 1814 "Exporter.c"
}
@@ -1826,28 +1828,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 1830 "Exporter.c"
+#line 1832 "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 1837 "Exporter.c"
+#line 1839 "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 1844 "Exporter.c"
+#line 1846 "Exporter.c"
}
static gpointer _scaling_dup0 (gpointer self) {
#line 87 "/home/jens/Source/shotwell/src/Exporter.vala"
return self ? scaling_dup (self) : NULL;
-#line 1851 "Exporter.c"
+#line 1853 "Exporter.c"
}
@@ -1859,14 +1861,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 1863 "Exporter.c"
+#line 1865 "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 1870 "Exporter.c"
+#line 1872 "Exporter.c"
}
@@ -1878,14 +1880,14 @@ 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 1882 "Exporter.c"
+#line 1884 "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 1889 "Exporter.c"
+#line 1891 "Exporter.c"
}
@@ -1933,14 +1935,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 1937 "Exporter.c"
+#line 1939 "Exporter.c"
} else {
MediaSource* _tmp6_ = NULL;
#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 1944 "Exporter.c"
+#line 1946 "Exporter.c"
}
#line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
_vala_assert (_tmp4_, "media is Photo || media is Video");
@@ -1994,21 +1996,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 1998 "Exporter.c"
+#line 2000 "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 2005 "Exporter.c"
+#line 2007 "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 2012 "Exporter.c"
+#line 2014 "Exporter.c"
}
@@ -2017,14 +2019,14 @@ 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 2021 "Exporter.c"
+#line 2023 "Exporter.c"
{
MediaSource* _tmp0_ = NULL;
#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 2028 "Exporter.c"
+#line 2030 "Exporter.c"
MediaSource* _tmp1_ = NULL;
GFile* _tmp2_ = NULL;
Scaling* _tmp3_ = NULL;
@@ -2053,7 +2055,7 @@ 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 2057 "Exporter.c"
+#line 2059 "Exporter.c"
goto __catch479_g_error;
}
} else {
@@ -2062,7 +2064,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
_tmp9_ = self->media;
#line 98 "/home/jens/Source/shotwell/src/Exporter.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_VIDEO)) {
-#line 2066 "Exporter.c"
+#line 2068 "Exporter.c"
MediaSource* _tmp10_ = NULL;
GFile* _tmp11_ = NULL;
#line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2073,7 +2075,7 @@ 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 2077 "Exporter.c"
+#line 2079 "Exporter.c"
goto __catch479_g_error;
}
}
@@ -2099,7 +2101,7 @@ 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 2103 "Exporter.c"
+#line 2105 "Exporter.c"
}
__finally479:
#line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2110,7 +2112,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 2114 "Exporter.c"
+#line 2116 "Exporter.c"
}
}
@@ -2121,8 +2123,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 = exporter_export_job_real_execute;
-#line 2126 "Exporter.c"
+ ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) exporter_export_job_real_execute;
+#line 2128 "Exporter.c"
}
@@ -2133,7 +2135,7 @@ 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 2137 "Exporter.c"
+#line 2139 "Exporter.c"
}
@@ -2155,7 +2157,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 2159 "Exporter.c"
+#line 2161 "Exporter.c"
}
@@ -2178,7 +2180,7 @@ 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 2182 "Exporter.c"
+#line 2184 "Exporter.c"
}
@@ -2189,7 +2191,7 @@ static void exporter_instance_init (Exporter * self) {
#line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv = EXPORTER_GET_PRIVATE (self);
#line 107 "/home/jens/Source/shotwell/src/Exporter.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 107 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->to_export = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
#line 111 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2212,7 +2214,7 @@ static void exporter_instance_init (Exporter * self) {
self->priv->replace_all = FALSE;
#line 119 "/home/jens/Source/shotwell/src/Exporter.vala"
self->priv->aborted = FALSE;
-#line 2216 "Exporter.c"
+#line 2218 "Exporter.c"
}
@@ -2232,7 +2234,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 2236 "Exporter.c"
+#line 2238 "Exporter.c"
}
@@ -2266,21 +2268,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 2270 "Exporter.c"
+#line 2272 "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 2277 "Exporter.c"
+#line 2279 "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 2284 "Exporter.c"
+#line 2286 "Exporter.c"
}
@@ -2289,7 +2291,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 2293 "Exporter.c"
+#line 2295 "Exporter.c"
}
@@ -2298,7 +2300,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 2302 "Exporter.c"
+#line 2304 "Exporter.c"
}
@@ -2307,7 +2309,7 @@ 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 2311 "Exporter.c"
+#line 2313 "Exporter.c"
}
@@ -2368,7 +2370,7 @@ void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion
_tmp10_ = 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 2372 "Exporter.c"
+#line 2374 "Exporter.c"
}
@@ -2388,7 +2390,7 @@ 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 2392 "Exporter.c"
+#line 2394 "Exporter.c"
ProgressDialog* _tmp1_ = NULL;
#line 306 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp1_ = self->priv->progress_dialog;
@@ -2398,7 +2400,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 2402 "Exporter.c"
+#line 2404 "Exporter.c"
}
#line 310 "/home/jens/Source/shotwell/src/Exporter.vala"
_tmp2_ = app_window_get_instance ();
@@ -2418,7 +2420,7 @@ 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 2422 "Exporter.c"
+#line 2424 "Exporter.c"
}
@@ -2491,7 +2493,7 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
switch (_tmp14_) {
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
case GTK_RESPONSE_APPLY:
-#line 2495 "Exporter.c"
+#line 2497 "Exporter.c"
{
#line 325 "/home/jens/Source/shotwell/src/Exporter.vala"
result = EXPORTER_OVERWRITE_REPLACE_ALL;
@@ -2499,11 +2501,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 2503 "Exporter.c"
+#line 2505 "Exporter.c"
}
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
case GTK_RESPONSE_YES:
-#line 2507 "Exporter.c"
+#line 2509 "Exporter.c"
{
#line 328 "/home/jens/Source/shotwell/src/Exporter.vala"
result = EXPORTER_OVERWRITE_YES;
@@ -2511,11 +2513,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 2515 "Exporter.c"
+#line 2517 "Exporter.c"
}
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
case GTK_RESPONSE_CANCEL:
-#line 2519 "Exporter.c"
+#line 2521 "Exporter.c"
{
#line 331 "/home/jens/Source/shotwell/src/Exporter.vala"
result = EXPORTER_OVERWRITE_CANCEL;
@@ -2523,12 +2525,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 2527 "Exporter.c"
+#line 2529 "Exporter.c"
}
default:
#line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
case GTK_RESPONSE_NO:
-#line 2532 "Exporter.c"
+#line 2534 "Exporter.c"
{
#line 335 "/home/jens/Source/shotwell/src/Exporter.vala"
result = EXPORTER_OVERWRITE_NO;
@@ -2536,12 +2538,12 @@ 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 2540 "Exporter.c"
+#line 2542 "Exporter.c"
}
}
#line 315 "/home/jens/Source/shotwell/src/Exporter.vala"
_g_free0 (question);
-#line 2545 "Exporter.c"
+#line 2547 "Exporter.c"
}
@@ -2566,14 +2568,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 2570 "Exporter.c"
+#line 2572 "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 2577 "Exporter.c"
+#line 2579 "Exporter.c"
}
@@ -2582,7 +2584,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 2586 "Exporter.c"
+#line 2588 "Exporter.c"
}
}
@@ -2592,11 +2594,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 2596 "Exporter.c"
+#line 2598 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2600 "Exporter.c"
+#line 2602 "Exporter.c"
}
}
@@ -2604,37 +2606,37 @@ 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 2608 "Exporter.c"
+#line 2610 "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 2615 "Exporter.c"
+#line 2617 "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 2622 "Exporter.c"
+#line 2624 "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 2626 "Exporter.c"
+#line 2628 "Exporter.c"
}
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = exporter_ui_ref (object);
-#line 2630 "Exporter.c"
+#line 2632 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = NULL;
-#line 2634 "Exporter.c"
+#line 2636 "Exporter.c"
}
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return NULL;
-#line 2638 "Exporter.c"
+#line 2640 "Exporter.c"
}
@@ -2645,25 +2647,25 @@ static gchar* value_exporter_ui_lcopy_value (const GValue* value, guint n_collec
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 2649 "Exporter.c"
+#line 2651 "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 2655 "Exporter.c"
+#line 2657 "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 2659 "Exporter.c"
+#line 2661 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
*object_p = exporter_ui_ref (value->data[0].v_pointer);
-#line 2663 "Exporter.c"
+#line 2665 "Exporter.c"
}
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return NULL;
-#line 2667 "Exporter.c"
+#line 2669 "Exporter.c"
}
@@ -2677,7 +2679,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 2681 "Exporter.c"
+#line 2683 "Exporter.c"
}
@@ -2686,7 +2688,7 @@ 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 2690 "Exporter.c"
+#line 2692 "Exporter.c"
}
@@ -2706,17 +2708,17 @@ 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 2710 "Exporter.c"
+#line 2712 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = NULL;
-#line 2714 "Exporter.c"
+#line 2716 "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 2720 "Exporter.c"
+#line 2722 "Exporter.c"
}
}
@@ -2735,17 +2737,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 2739 "Exporter.c"
+#line 2741 "Exporter.c"
} else {
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
value->data[0].v_pointer = NULL;
-#line 2743 "Exporter.c"
+#line 2745 "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 2749 "Exporter.c"
+#line 2751 "Exporter.c"
}
}
@@ -2757,7 +2759,7 @@ 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 2761 "Exporter.c"
+#line 2763 "Exporter.c"
}
@@ -2775,7 +2777,7 @@ static void exporter_ui_instance_init (ExporterUI * self) {
self->priv->completion_callback = NULL;
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
self->ref_count = 1;
-#line 2779 "Exporter.c"
+#line 2781 "Exporter.c"
}
@@ -2791,7 +2793,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 2795 "Exporter.c"
+#line 2797 "Exporter.c"
}
@@ -2816,7 +2818,7 @@ gpointer exporter_ui_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
return instance;
-#line 2820 "Exporter.c"
+#line 2822 "Exporter.c"
}
@@ -2829,7 +2831,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 2833 "Exporter.c"
+#line 2835 "Exporter.c"
}
}