summaryrefslogtreecommitdiff
path: root/src/data_imports
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
commit2492891f112caac6076ce49721d9d5d78a152c3a (patch)
tree36dd11a60bd963e6bd44e2e312b6e4b57d1849ea /src/data_imports
parent3c829c50a8f705402bdc759946d49ae7caebd003 (diff)
New upstream version 0.26.4upstream/0.26.4
Diffstat (limited to 'src/data_imports')
-rw-r--r--src/data_imports/DataImportJob.c422
-rw-r--r--src/data_imports/DataImportSource.c282
-rw-r--r--src/data_imports/DataImports.c33
-rw-r--r--src/data_imports/DataImportsPluginHost.c1305
-rw-r--r--src/data_imports/DataImportsUI.c1215
5 files changed, 1609 insertions, 1648 deletions
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 8f75c81..5b62a91 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -1,4 +1,4 @@
-/* DataImportJob.c generated by valac 0.34.7, the Vala compiler
+/* DataImportJob.c generated by valac 0.36.6, the Vala compiler
* generated from DataImportJob.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -260,8 +260,8 @@ struct _BatchImportJobClass {
gchar* (*get_path) (BatchImportJob* self);
DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
- gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile** file_or_dir);
- gboolean (*prepare) (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+ gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
+ gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
time_t (*get_exposure_time_override) (BatchImportJob* self);
};
@@ -390,8 +390,8 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base);
static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base);
static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated);
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file);
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
+static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self);
static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error);
GType photo_source_get_type (void) G_GNUC_CONST;
@@ -431,7 +431,7 @@ GType dateable_get_type (void) G_GNUC_CONST;
void dateable_set_exposure_time (Dateable* self, time_t target_time);
void photo_set_import_id (Photo* self, ImportID* import_id);
gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag);
-static void spit_data_imports_data_import_job_finalize (BatchImportJob* obj);
+static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj);
static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -445,14 +445,14 @@ static gpointer _spit_data_imports_data_import_source_ref0 (gpointer self) {
SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source) {
SpitDataImportsDataImportJob* self = NULL;
- SpitDataImportsDataImportSource* _tmp0_ = NULL;
- SpitDataImportsDataImportSource* _tmp1_ = NULL;
- SpitDataImportsDataImportSource* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- SpitDataImportsDataImportSource* _tmp4_ = NULL;
- guint64 _tmp5_ = 0ULL;
- SpitDataImportsDataImportSource* _tmp6_ = NULL;
- time_t _tmp7_ = 0;
+ SpitDataImportsDataImportSource* _tmp0_;
+ SpitDataImportsDataImportSource* _tmp1_;
+ SpitDataImportsDataImportSource* _tmp2_;
+ GFile* _tmp3_;
+ SpitDataImportsDataImportSource* _tmp4_;
+ guint64 _tmp5_;
+ SpitDataImportsDataImportSource* _tmp6_;
+ time_t _tmp7_;
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (import_source), NULL);
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -508,13 +508,13 @@ static gpointer _g_object_ref0 (gpointer self) {
static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag** src_tags, int src_tags_length1) {
HierarchicalTagIndex* result = NULL;
GeeSet* detected_htags = NULL;
- GeeHashSet* _tmp0_ = NULL;
- SpitDataImportsImportableTag** _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
+ GeeHashSet* _tmp0_;
+ SpitDataImportsImportableTag** _tmp1_;
+ gint _tmp1__length1;
HierarchicalTagIndex* _tmp33_ = NULL;
- GeeSet* _tmp34_ = NULL;
- gint _tmp35_ = 0;
- gint _tmp36_ = 0;
+ GeeSet* _tmp34_;
+ gint _tmp35_;
+ gint _tmp36_;
#line 29 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
#line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -538,7 +538,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
for (src_tag_it = 0; src_tag_it < _tmp1__length1; src_tag_it = src_tag_it + 1) {
#line 541 "DataImportJob.c"
- SpitDataImportsImportableTag* _tmp2_ = NULL;
+ SpitDataImportsImportableTag* _tmp2_;
SpitDataImportsImportableTag* src_tag = NULL;
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp2_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
@@ -547,19 +547,19 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
#line 548 "DataImportJob.c"
{
gchar* prepped = NULL;
- SpitDataImportsImportableTag* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gchar** _tmp5_ = NULL;
- gchar** _tmp6_ = NULL;
- gint _tmp6__length1 = 0;
- gint _tmp7_ = 0;
- gchar** _tmp8_ = NULL;
- gchar** _tmp9_ = NULL;
- gint _tmp9__length1 = 0;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
+ SpitDataImportsImportableTag* _tmp3_;
+ gint _tmp4_;
+ gchar** _tmp5_;
+ gchar** _tmp6_;
+ gint _tmp6__length1;
+ gint _tmp7_;
+ gchar** _tmp8_;
+ gchar** _tmp9_;
+ gint _tmp9__length1;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
gboolean _tmp12_ = FALSE;
- const gchar* _tmp13_ = NULL;
+ const gchar* _tmp13_;
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp3_ = src_tag;
#line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -589,8 +589,8 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp13_ != NULL) {
#line 592 "DataImportJob.c"
- const gchar* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ const gchar* _tmp14_;
+ gboolean _tmp15_;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp14_ = prepped;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -606,11 +606,11 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp12_) {
#line 609 "DataImportJob.c"
- GeeSet* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
+ GeeSet* _tmp16_;
+ const gchar* _tmp17_;
GeeList* parents = NULL;
- const gchar* _tmp18_ = NULL;
- GeeList* _tmp19_ = NULL;
+ const gchar* _tmp18_;
+ GeeList* _tmp19_;
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp16_ = detected_htags;
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -626,12 +626,12 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
#line 627 "DataImportJob.c"
{
GeeList* _parent_list = NULL;
- GeeList* _tmp20_ = NULL;
- GeeList* _tmp21_ = NULL;
+ GeeList* _tmp20_;
+ GeeList* _tmp21_;
gint _parent_size = 0;
- GeeList* _tmp22_ = NULL;
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
+ GeeList* _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
gint _parent_index = 0;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp20_ = parents;
@@ -652,15 +652,15 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
while (TRUE) {
#line 655 "DataImportJob.c"
- gint _tmp25_ = 0;
- gint _tmp26_ = 0;
- gint _tmp27_ = 0;
+ gint _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_;
gchar* parent = NULL;
- GeeList* _tmp28_ = NULL;
- gint _tmp29_ = 0;
- gpointer _tmp30_ = NULL;
- GeeSet* _tmp31_ = NULL;
- const gchar* _tmp32_ = NULL;
+ GeeList* _tmp28_;
+ gint _tmp29_;
+ gpointer _tmp30_;
+ GeeSet* _tmp31_;
+ const gchar* _tmp32_;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp25_ = _parent_index;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -718,8 +718,8 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp36_ > 0) {
#line 721 "DataImportJob.c"
- GeeSet* _tmp37_ = NULL;
- HierarchicalTagIndex* _tmp38_ = NULL;
+ GeeSet* _tmp37_;
+ HierarchicalTagIndex* _tmp38_;
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp37_ = detected_htags;
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -748,7 +748,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self) {
time_t result = 0;
- time_t _tmp0_ = 0;
+ time_t _tmp0_;
#line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), 0);
#line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -764,8 +764,8 @@ time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataI
static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchImportJob* base) {
SpitDataImportsDataImportJob * self;
gchar* result = NULL;
- SpitDataImportsDataImportSource* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ SpitDataImportsDataImportSource* _tmp0_;
+ gchar* _tmp1_;
#line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -783,8 +783,8 @@ static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchI
static gchar* spit_data_imports_data_import_job_real_get_source_identifier (BatchImportJob* base) {
SpitDataImportsDataImportJob * self;
gchar* result = NULL;
- SpitDataImportsDataImportSource* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ SpitDataImportsDataImportSource* _tmp0_;
+ gchar* _tmp1_;
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 60 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -815,8 +815,8 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base) {
SpitDataImportsDataImportJob * self;
gchar* result = NULL;
- GFile* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ gchar* _tmp1_;
#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -834,11 +834,11 @@ static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJo
static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base) {
SpitDataImportsDataImportJob * self;
gchar* result = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
+ GFile* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -870,8 +870,8 @@ static gpointer _batch_import_job_ref0 (gpointer self) {
static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
SpitDataImportsDataImportJob * self;
- BatchImportJob* _tmp0_ = NULL;
- SpitDataImportsDataImportJob* _tmp1_ = NULL;
+ BatchImportJob* _tmp0_;
+ SpitDataImportsDataImportJob* _tmp1_;
#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -888,12 +888,12 @@ static void spit_data_imports_data_import_job_real_set_associated (BatchImportJo
}
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file) {
+static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) {
SpitDataImportsDataImportJob * self;
guint64 _vala_filesize = 0ULL;
GFile* _vala_file = NULL;
gboolean result = FALSE;
- guint64 _tmp0_ = 0ULL;
+ guint64 _tmp0_;
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -928,21 +928,21 @@ static gboolean spit_data_imports_data_import_job_real_determine_file_size (Batc
}
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error) {
+static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
SpitDataImportsDataImportJob * self;
GFile* _vala_file_to_import = NULL;
gboolean _vala_copy_to_library = FALSE;
gboolean result = FALSE;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- SpitDataImportsDataImportSource* _tmp2_ = NULL;
- SpitDataImportsImportableMediaItem* _tmp3_ = NULL;
- SpitDataImportsImportableMediaItem* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- SpitDataImportsImportableTag** _tmp6_ = NULL;
- SpitDataImportsImportableTag** _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
- HierarchicalTagIndex* _tmp8_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
+ SpitDataImportsDataImportSource* _tmp2_;
+ SpitDataImportsImportableMediaItem* _tmp3_;
+ SpitDataImportsImportableMediaItem* _tmp4_;
+ gint _tmp5_;
+ SpitDataImportsImportableTag** _tmp6_;
+ SpitDataImportsImportableTag** _tmp7_;
+ gint _tmp7__length1;
+ HierarchicalTagIndex* _tmp8_;
#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1005,44 +1005,44 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
SpitDataImportsDataImportJob * self;
gboolean result = FALSE;
LibraryPhoto* photo = NULL;
- MediaSource* _tmp0_ = NULL;
- LibraryPhoto* _tmp1_ = NULL;
- LibraryPhoto* _tmp2_ = NULL;
+ MediaSource* _tmp0_;
+ LibraryPhoto* _tmp1_;
+ LibraryPhoto* _tmp2_;
SpitDataImportsImportableMediaItem* src_photo = NULL;
- SpitDataImportsDataImportSource* _tmp3_ = NULL;
- SpitDataImportsImportableMediaItem* _tmp4_ = NULL;
- HierarchicalTagIndex* _tmp5_ = NULL;
+ SpitDataImportsDataImportSource* _tmp3_;
+ SpitDataImportsImportableMediaItem* _tmp4_;
+ HierarchicalTagIndex* _tmp5_;
SpitDataImportsImportableTag** src_tags = NULL;
- SpitDataImportsImportableMediaItem* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- SpitDataImportsImportableTag** _tmp19_ = NULL;
- gint src_tags_length1 = 0;
- gint _src_tags_size_ = 0;
- SpitDataImportsImportableTag** _tmp20_ = NULL;
- gint _tmp20__length1 = 0;
+ SpitDataImportsImportableMediaItem* _tmp17_;
+ gint _tmp18_;
+ SpitDataImportsImportableTag** _tmp19_;
+ gint src_tags_length1;
+ gint _src_tags_size_;
+ SpitDataImportsImportableTag** _tmp20_;
+ gint _tmp20__length1;
SpitDataImportsImportableEvent* src_event = NULL;
- SpitDataImportsImportableMediaItem* _tmp61_ = NULL;
- SpitDataImportsImportableEvent* _tmp62_ = NULL;
- SpitDataImportsImportableEvent* _tmp63_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp61_;
+ SpitDataImportsImportableEvent* _tmp62_;
+ SpitDataImportsImportableEvent* _tmp63_;
Rating dst_rating = 0;
SpitDataImportsImportableRating* src_rating = NULL;
- SpitDataImportsImportableMediaItem* _tmp74_ = NULL;
- SpitDataImportsImportableRating* _tmp75_ = NULL;
- SpitDataImportsImportableRating* _tmp76_ = NULL;
- gboolean _tmp77_ = FALSE;
- LibraryPhoto* _tmp83_ = NULL;
- Rating _tmp84_ = 0;
+ SpitDataImportsImportableMediaItem* _tmp74_;
+ SpitDataImportsImportableRating* _tmp75_;
+ SpitDataImportsImportableRating* _tmp76_;
+ gboolean _tmp77_;
+ LibraryPhoto* _tmp83_;
+ Rating _tmp84_;
gchar* title = NULL;
- SpitDataImportsImportableMediaItem* _tmp85_ = NULL;
- gchar* _tmp86_ = NULL;
- const gchar* _tmp87_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp85_;
+ gchar* _tmp86_;
+ const gchar* _tmp87_;
time_t* date_time = NULL;
- SpitDataImportsImportableMediaItem* _tmp90_ = NULL;
- time_t* _tmp91_ = NULL;
- time_t* _tmp92_ = NULL;
- LibraryPhoto* _tmp95_ = NULL;
- BatchImportRoll* _tmp96_ = NULL;
- ImportID _tmp97_ = {0};
+ SpitDataImportsImportableMediaItem* _tmp90_;
+ time_t* _tmp91_;
+ time_t* _tmp92_;
+ LibraryPhoto* _tmp95_;
+ BatchImportRoll* _tmp96_;
+ ImportID _tmp97_;
#line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
#line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1079,8 +1079,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
if (_tmp5_ != NULL) {
#line 1081 "DataImportJob.c"
GeeCollection* paths = NULL;
- HierarchicalTagIndex* _tmp6_ = NULL;
- GeeCollection* _tmp7_ = NULL;
+ HierarchicalTagIndex* _tmp6_;
+ GeeCollection* _tmp7_;
#line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp6_ = self->priv->detected_htags;
#line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1090,8 +1090,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 1091 "DataImportJob.c"
{
GeeIterator* _path_it = NULL;
- GeeCollection* _tmp8_ = NULL;
- GeeIterator* _tmp9_ = NULL;
+ GeeCollection* _tmp8_;
+ GeeIterator* _tmp9_;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp8_ = paths;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1101,14 +1101,14 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
while (TRUE) {
#line 1104 "DataImportJob.c"
- GeeIterator* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
+ GeeIterator* _tmp10_;
+ gboolean _tmp11_;
gchar* path = NULL;
- GeeIterator* _tmp12_ = NULL;
- gpointer _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- Tag* _tmp15_ = NULL;
- Tag* _tmp16_ = NULL;
+ GeeIterator* _tmp12_;
+ gpointer _tmp13_;
+ const gchar* _tmp14_;
+ Tag* _tmp15_;
+ Tag* _tmp16_;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp10_ = _path_it;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1172,7 +1172,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
for (src_tag_it = 0; src_tag_it < _tmp20__length1; src_tag_it = src_tag_it + 1) {
#line 1175 "DataImportJob.c"
- SpitDataImportsImportableTag* _tmp21_ = NULL;
+ SpitDataImportsImportableTag* _tmp21_;
SpitDataImportsImportableTag* src_tag = NULL;
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp21_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
@@ -1181,18 +1181,18 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 1182 "DataImportJob.c"
{
gchar* prepped = NULL;
- SpitDataImportsImportableTag* _tmp22_ = NULL;
- gint _tmp23_ = 0;
- gchar** _tmp24_ = NULL;
- gchar** _tmp25_ = NULL;
- gint _tmp25__length1 = 0;
- gint _tmp26_ = 0;
- gchar** _tmp27_ = NULL;
- gchar** _tmp28_ = NULL;
- gint _tmp28__length1 = 0;
- gchar* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
+ SpitDataImportsImportableTag* _tmp22_;
+ gint _tmp23_;
+ gchar** _tmp24_;
+ gchar** _tmp25_;
+ gint _tmp25__length1;
+ gint _tmp26_;
+ gchar** _tmp27_;
+ gchar** _tmp28_;
+ gint _tmp28__length1;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ const gchar* _tmp31_;
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp22_ = src_tag;
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1222,16 +1222,16 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp31_ != NULL) {
#line 1225 "DataImportJob.c"
- const gchar* _tmp32_ = NULL;
- GeeList* _tmp33_ = NULL;
- GeeList* _tmp34_ = NULL;
- gint _tmp35_ = 0;
- gint _tmp36_ = 0;
- gboolean _tmp37_ = FALSE;
- const gchar* _tmp57_ = NULL;
- Tag* _tmp58_ = NULL;
- Tag* _tmp59_ = NULL;
- LibraryPhoto* _tmp60_ = NULL;
+ const gchar* _tmp32_;
+ GeeList* _tmp33_;
+ GeeList* _tmp34_;
+ gint _tmp35_;
+ gint _tmp36_;
+ gboolean _tmp37_;
+ const gchar* _tmp57_;
+ Tag* _tmp58_;
+ Tag* _tmp59_;
+ LibraryPhoto* _tmp60_;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp32_ = prepped;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1249,8 +1249,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp37_) {
#line 1252 "DataImportJob.c"
- const gchar* _tmp38_ = NULL;
- gboolean _tmp39_ = FALSE;
+ const gchar* _tmp38_;
+ gboolean _tmp39_;
#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp38_ = prepped;
#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1258,8 +1258,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp39_) {
#line 1261 "DataImportJob.c"
- const gchar* _tmp40_ = NULL;
- gchar* _tmp41_ = NULL;
+ const gchar* _tmp40_;
+ gchar* _tmp41_;
#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp40_ = prepped;
#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1272,20 +1272,20 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
}
} else {
GeeList* parents = NULL;
- const gchar* _tmp42_ = NULL;
- GeeList* _tmp43_ = NULL;
- GeeList* _tmp44_ = NULL;
- gint _tmp45_ = 0;
- gint _tmp46_ = 0;
+ const gchar* _tmp42_;
+ GeeList* _tmp43_;
+ GeeList* _tmp44_;
+ gint _tmp45_;
+ gint _tmp46_;
gchar* top_level_parent = NULL;
- GeeList* _tmp47_ = NULL;
- gpointer _tmp48_ = NULL;
+ GeeList* _tmp47_;
+ gpointer _tmp48_;
gchar* flat_top_level_parent = NULL;
- const gchar* _tmp49_ = NULL;
- gchar* _tmp50_ = NULL;
- TagSourceCollection* _tmp51_ = NULL;
- const gchar* _tmp52_ = NULL;
- gboolean _tmp53_ = FALSE;
+ const gchar* _tmp49_;
+ gchar* _tmp50_;
+ TagSourceCollection* _tmp51_;
+ const gchar* _tmp52_;
+ gboolean _tmp53_;
#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp42_ = prepped;
#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1321,9 +1321,9 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp53_) {
#line 1324 "DataImportJob.c"
- const gchar* _tmp54_ = NULL;
- Tag* _tmp55_ = NULL;
- Tag* _tmp56_ = NULL;
+ const gchar* _tmp54_;
+ Tag* _tmp55_;
+ Tag* _tmp56_;
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp54_ = flat_top_level_parent;
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1378,12 +1378,12 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
if (_tmp63_ != NULL) {
#line 1380 "DataImportJob.c"
gchar* prepped = NULL;
- SpitDataImportsImportableEvent* _tmp64_ = NULL;
- gchar* _tmp65_ = NULL;
- gchar* _tmp66_ = NULL;
- gchar* _tmp67_ = NULL;
- gchar* _tmp68_ = NULL;
- const gchar* _tmp69_ = NULL;
+ SpitDataImportsImportableEvent* _tmp64_;
+ gchar* _tmp65_;
+ gchar* _tmp66_;
+ gchar* _tmp67_;
+ gchar* _tmp68_;
+ const gchar* _tmp69_;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp64_ = src_event;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1403,10 +1403,10 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp69_ != NULL) {
#line 1406 "DataImportJob.c"
- LibraryPhoto* _tmp70_ = NULL;
- BatchImportRoll* _tmp71_ = NULL;
- ViewCollection* _tmp72_ = NULL;
- const gchar* _tmp73_ = NULL;
+ LibraryPhoto* _tmp70_;
+ BatchImportRoll* _tmp71_;
+ ViewCollection* _tmp72_;
+ const gchar* _tmp73_;
#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp70_ = photo;
#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1439,8 +1439,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
dst_rating = RATING_REJECTED;
#line 1441 "DataImportJob.c"
} else {
- SpitDataImportsImportableRating* _tmp78_ = NULL;
- gboolean _tmp79_ = FALSE;
+ SpitDataImportsImportableRating* _tmp78_;
+ gboolean _tmp79_;
#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp78_ = src_rating;
#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1451,9 +1451,9 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
dst_rating = RATING_UNRATED;
#line 1453 "DataImportJob.c"
} else {
- SpitDataImportsImportableRating* _tmp80_ = NULL;
- gint _tmp81_ = 0;
- Rating _tmp82_ = 0;
+ SpitDataImportsImportableRating* _tmp80_;
+ gint _tmp81_;
+ Rating _tmp82_;
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp80_ = src_rating;
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1482,8 +1482,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp87_ != NULL) {
#line 1485 "DataImportJob.c"
- LibraryPhoto* _tmp88_ = NULL;
- const gchar* _tmp89_ = NULL;
+ LibraryPhoto* _tmp88_;
+ const gchar* _tmp89_;
#line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp88_ = photo;
#line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1503,8 +1503,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
#line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp92_ != NULL) {
#line 1506 "DataImportJob.c"
- LibraryPhoto* _tmp93_ = NULL;
- time_t* _tmp94_ = NULL;
+ LibraryPhoto* _tmp93_;
+ time_t* _tmp94_;
#line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp93_ = photo;
#line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1546,12 +1546,12 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag* tag, int* result_length1) {
gchar** result = NULL;
GeeList* components = NULL;
- GeeLinkedList* _tmp0_ = NULL;
- GeeList* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- gpointer* _tmp15_ = NULL;
- gchar** _tmp16_ = NULL;
- gint _tmp16__length1 = 0;
+ GeeLinkedList* _tmp0_;
+ GeeList* _tmp13_;
+ gint _tmp14_;
+ gpointer* _tmp15_;
+ gchar** _tmp16_;
+ gint _tmp16__length1;
#line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
#line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1563,8 +1563,8 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
#line 1564 "DataImportJob.c"
{
SpitDataImportsImportableTag* current_tag = NULL;
- SpitDataImportsImportableTag* _tmp1_ = NULL;
- SpitDataImportsImportableTag* _tmp2_ = NULL;
+ SpitDataImportsImportableTag* _tmp1_;
+ SpitDataImportsImportableTag* _tmp2_;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp1_ = tag;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1579,18 +1579,18 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
while (TRUE) {
#line 1582 "DataImportJob.c"
- SpitDataImportsImportableTag* _tmp6_ = NULL;
- GeeList* _tmp7_ = NULL;
- SpitDataImportsImportableTag* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
+ SpitDataImportsImportableTag* _tmp6_;
+ GeeList* _tmp7_;
+ SpitDataImportsImportableTag* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (!_tmp3_) {
#line 1592 "DataImportJob.c"
- SpitDataImportsImportableTag* _tmp4_ = NULL;
- SpitDataImportsImportableTag* _tmp5_ = NULL;
+ SpitDataImportsImportableTag* _tmp4_;
+ SpitDataImportsImportableTag* _tmp5_;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp4_ = current_tag;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1668,23 +1668,23 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
g_type_class_add_private (klass, sizeof (SpitDataImportsDataImportJobPrivate));
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_dest_identifier;
+ ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_dest_identifier;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_source_identifier;
+ ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_source_identifier;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- ((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_is_directory;
+ ((BatchImportJobClass *) klass)->is_directory = (gboolean (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_is_directory;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- ((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_basename;
+ ((BatchImportJobClass *) klass)->get_basename = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_basename;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- ((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_path;
+ ((BatchImportJobClass *) klass)->get_path = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_path;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- ((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) spit_data_imports_data_import_job_real_set_associated;
+ ((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) spit_data_imports_data_import_job_real_set_associated;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) spit_data_imports_data_import_job_real_determine_file_size;
+ ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) spit_data_imports_data_import_job_real_determine_file_size;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- ((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
+ ((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
- ((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
+ ((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
#line 1689 "DataImportJob.c"
}
@@ -1700,7 +1700,7 @@ static void spit_data_imports_data_import_job_instance_init (SpitDataImportsData
}
-static void spit_data_imports_data_import_job_finalize (BatchImportJob* obj) {
+static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
SpitDataImportsDataImportJob * self;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 97e9bbd..715b62a 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -1,4 +1,4 @@
-/* DataImportSource.c generated by valac 0.34.7, the Vala compiler
+/* DataImportSource.c generated by valac 0.36.6, the Vala compiler
* generated from DataImportSource.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -178,7 +178,7 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho
gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self);
gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format);
gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self);
-static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource* obj);
+static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj);
static gpointer _g_object_ref0 (gpointer self) {
@@ -204,19 +204,19 @@ static gpointer _photo_preview_ref0 (gpointer self) {
SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, SpitDataImportsImportableMediaItem* db_photo) {
SpitDataImportsDataImportSource* self = NULL;
- SpitDataImportsImportableMediaItem* _tmp0_ = NULL;
- SpitDataImportsImportableMediaItem* _tmp1_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp0_;
+ SpitDataImportsImportableMediaItem* _tmp1_;
gchar* folder_path = NULL;
- SpitDataImportsImportableMediaItem* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp2_;
+ gchar* _tmp3_;
gchar* filename = NULL;
- SpitDataImportsImportableMediaItem* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp4_;
+ gchar* _tmp5_;
GFile* photo = NULL;
gboolean _tmp6_ = FALSE;
- const gchar* _tmp7_ = NULL;
+ const gchar* _tmp7_;
gboolean _tmp20_ = FALSE;
- GFile* _tmp21_ = NULL;
+ GFile* _tmp21_;
GError * _inner_error_ = NULL;
#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (db_photo), NULL);
@@ -249,7 +249,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp7_ != NULL) {
#line 252 "DataImportSource.c"
- const gchar* _tmp8_ = NULL;
+ const gchar* _tmp8_;
#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp8_ = filename;
#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -263,17 +263,17 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp6_) {
#line 266 "DataImportSource.c"
- SpitDataImportsImportableMediaItem* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- GFile* _tmp12_ = NULL;
- GFile* _tmp13_ = NULL;
- SpitDataImportsImportableMediaItem* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- GFile* _tmp17_ = NULL;
- GFile* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
+ SpitDataImportsImportableMediaItem* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ GFile* _tmp12_;
+ GFile* _tmp13_;
+ SpitDataImportsImportableMediaItem* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ GFile* _tmp17_;
+ GFile* _tmp18_;
+ gboolean _tmp19_;
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp9_ = db_photo;
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -319,7 +319,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp21_ != NULL) {
#line 322 "DataImportSource.c"
- gboolean _tmp22_ = FALSE;
+ gboolean _tmp22_;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp22_ = self->priv->backing_file_found;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -334,27 +334,27 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
if (_tmp20_) {
#line 336 "DataImportSource.c"
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp23_ = NULL;
- SpitDataImportsImportableMediaItem* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- const gchar* _tmp32_ = NULL;
+ PhotoMetadata* _tmp23_;
+ SpitDataImportsImportableMediaItem* _tmp30_;
+ gchar* _tmp31_;
+ const gchar* _tmp32_;
time_t* date_time = NULL;
- SpitDataImportsImportableMediaItem* _tmp38_ = NULL;
- time_t* _tmp39_ = NULL;
- time_t* _tmp40_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp38_;
+ time_t* _tmp39_;
+ time_t* _tmp40_;
PhotoPreview* _tmp48_ = NULL;
- PhotoMetadata* _tmp49_ = NULL;
+ PhotoMetadata* _tmp49_;
PhotoPreview* preview = NULL;
- PhotoPreview* _tmp52_ = NULL;
- PhotoPreview* _tmp53_ = NULL;
+ PhotoPreview* _tmp52_;
+ PhotoPreview* _tmp53_;
#line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp23_ = photo_metadata_new ();
#line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
metadata = _tmp23_;
#line 355 "DataImportSource.c"
{
- PhotoMetadata* _tmp24_ = NULL;
- GFile* _tmp25_ = NULL;
+ PhotoMetadata* _tmp24_;
+ GFile* _tmp25_;
#line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp24_ = metadata;
#line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -364,17 +364,17 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 367 "DataImportSource.c"
- goto __catch217_g_error;
+ goto __catch218_g_error;
}
}
- goto __finally217;
- __catch217_g_error:
+ goto __finally218;
+ __catch218_g_error:
{
GError* e = NULL;
- gchar* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- GError* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
+ gchar* _tmp26_;
+ gchar* _tmp27_;
+ GError* _tmp28_;
+ const gchar* _tmp29_;
#line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
e = _inner_error_;
#line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -399,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_g_error_free0 (e);
#line 401 "DataImportSource.c"
}
- __finally217:
+ __finally218:
#line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -432,15 +432,15 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
if (_tmp32_ == NULL) {
#line 434 "DataImportSource.c"
gchar* _tmp33_ = NULL;
- PhotoMetadata* _tmp34_ = NULL;
- gchar* _tmp37_ = NULL;
+ PhotoMetadata* _tmp34_;
+ gchar* _tmp37_;
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp34_ = metadata;
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp34_ != NULL) {
#line 442 "DataImportSource.c"
- PhotoMetadata* _tmp35_ = NULL;
- gchar* _tmp36_ = NULL;
+ PhotoMetadata* _tmp35_;
+ gchar* _tmp36_;
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp35_ = metadata;
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -478,8 +478,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp40_ != NULL) {
#line 481 "DataImportSource.c"
- time_t* _tmp41_ = NULL;
- MetadataDateTime* _tmp42_ = NULL;
+ time_t* _tmp41_;
+ MetadataDateTime* _tmp42_;
#line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp41_ = date_time;
#line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -491,15 +491,15 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 492 "DataImportSource.c"
} else {
MetadataDateTime* _tmp43_ = NULL;
- PhotoMetadata* _tmp44_ = NULL;
- MetadataDateTime* _tmp47_ = NULL;
+ PhotoMetadata* _tmp44_;
+ MetadataDateTime* _tmp47_;
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp44_ = metadata;
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp44_ != NULL) {
#line 501 "DataImportSource.c"
- PhotoMetadata* _tmp45_ = NULL;
- MetadataDateTime* _tmp46_ = NULL;
+ PhotoMetadata* _tmp45_;
+ MetadataDateTime* _tmp46_;
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp45_ = metadata;
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -531,8 +531,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp49_ != NULL) {
#line 534 "DataImportSource.c"
- PhotoMetadata* _tmp50_ = NULL;
- PhotoPreview* _tmp51_ = NULL;
+ PhotoMetadata* _tmp50_;
+ PhotoPreview* _tmp51_;
#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp50_ = metadata;
#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -560,16 +560,16 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 561 "DataImportSource.c"
{
guint8* preview_raw = NULL;
- PhotoPreview* _tmp54_ = NULL;
- gint _tmp55_ = 0;
- guint8* _tmp56_ = NULL;
- gint preview_raw_length1 = 0;
- gint _preview_raw_size_ = 0;
- guint8* _tmp57_ = NULL;
- gint _tmp57__length1 = 0;
- guint8* _tmp58_ = NULL;
- gint _tmp58__length1 = 0;
- gchar* _tmp59_ = NULL;
+ PhotoPreview* _tmp54_;
+ gint _tmp55_;
+ guint8* _tmp56_;
+ gint preview_raw_length1;
+ gint _preview_raw_size_;
+ guint8* _tmp57_;
+ gint _tmp57__length1;
+ guint8* _tmp58_;
+ gint _tmp58__length1;
+ gchar* _tmp59_;
#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp54_ = preview;
#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -583,7 +583,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 586 "DataImportSource.c"
- goto __catch218_g_error;
+ goto __catch219_g_error;
}
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp57_ = preview_raw;
@@ -603,14 +603,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
preview_raw = (g_free (preview_raw), NULL);
#line 605 "DataImportSource.c"
}
- goto __finally218;
- __catch218_g_error:
+ goto __finally219;
+ __catch219_g_error:
{
GError* e = NULL;
- gchar* _tmp60_ = NULL;
- gchar* _tmp61_ = NULL;
- GError* _tmp62_ = NULL;
- const gchar* _tmp63_ = NULL;
+ gchar* _tmp60_;
+ gchar* _tmp61_;
+ GError* _tmp62_;
+ const gchar* _tmp63_;
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
e = _inner_error_;
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -631,7 +631,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_g_error_free0 (e);
#line 633 "DataImportSource.c"
}
- __finally218:
+ __finally219:
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -659,8 +659,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
}
{
guint64 _tmp64_ = 0ULL;
- GFile* _tmp65_ = NULL;
- guint64 _tmp66_ = 0ULL;
+ GFile* _tmp65_;
+ guint64 _tmp66_;
#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp65_ = photo;
#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -670,20 +670,20 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 673 "DataImportSource.c"
- goto __catch219_g_error;
+ goto __catch220_g_error;
}
#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
self->priv->file_size = _tmp64_;
#line 678 "DataImportSource.c"
}
- goto __finally219;
- __catch219_g_error:
+ goto __finally220;
+ __catch220_g_error:
{
GError* e = NULL;
- gchar* _tmp67_ = NULL;
- gchar* _tmp68_ = NULL;
- GError* _tmp69_ = NULL;
- const gchar* _tmp70_ = NULL;
+ gchar* _tmp67_;
+ gchar* _tmp68_;
+ GError* _tmp69_;
+ const gchar* _tmp70_;
#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
e = _inner_error_;
#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -704,7 +704,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_g_error_free0 (e);
#line 706 "DataImportSource.c"
}
- __finally219:
+ __finally220:
#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -731,8 +731,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
}
{
time_t _tmp71_ = 0;
- GFile* _tmp72_ = NULL;
- time_t _tmp73_ = 0;
+ GFile* _tmp72_;
+ time_t _tmp73_;
#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp72_ = photo;
#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -742,20 +742,20 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 745 "DataImportSource.c"
- goto __catch220_g_error;
+ goto __catch221_g_error;
}
#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
self->priv->modification_time = _tmp71_;
#line 750 "DataImportSource.c"
}
- goto __finally220;
- __catch220_g_error:
+ goto __finally221;
+ __catch221_g_error:
{
GError* e = NULL;
- gchar* _tmp74_ = NULL;
- gchar* _tmp75_ = NULL;
- GError* _tmp76_ = NULL;
- const gchar* _tmp77_ = NULL;
+ gchar* _tmp74_;
+ gchar* _tmp75_;
+ GError* _tmp76_;
+ const gchar* _tmp77_;
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
e = _inner_error_;
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -776,7 +776,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_g_error_free0 (e);
#line 778 "DataImportSource.c"
}
- __finally220:
+ __finally221:
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -811,11 +811,11 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_media_metadata_unref0 (metadata);
#line 813 "DataImportSource.c"
} else {
- GFile* _tmp78_ = NULL;
- gchar* _tmp79_ = NULL;
- gchar* _tmp80_ = NULL;
- gchar* _tmp81_ = NULL;
- gchar* _tmp82_ = NULL;
+ GFile* _tmp78_;
+ gchar* _tmp79_;
+ gchar* _tmp80_;
+ gchar* _tmp81_;
+ gchar* _tmp82_;
#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp78_ = photo;
#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -855,8 +855,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitD
gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self) {
gchar* result = NULL;
- SpitDataImportsImportableMediaItem* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp0_;
+ gchar* _tmp1_;
#line 89 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -873,8 +873,8 @@ gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImp
gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self) {
gchar* result = NULL;
- SpitDataImportsImportableMediaItem* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp0_;
+ gchar* _tmp1_;
#line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -891,14 +891,14 @@ gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImpo
GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self) {
GFile* result = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- GFile* _tmp6_ = NULL;
- GFile* _tmp7_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ GFile* _tmp6_;
+ GFile* _tmp7_;
#line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -934,8 +934,8 @@ GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportS
gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportSource* self) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -945,8 +945,8 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (!_tmp2_) {
#line 948 "DataImportSource.c"
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp3_ = self->priv->title;
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -957,7 +957,7 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS
_tmp0_ = _tmp4_;
#line 959 "DataImportSource.c"
} else {
- gchar* _tmp5_ = NULL;
+ gchar* _tmp5_;
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp5_ = spit_data_imports_data_import_source_get_filename (self);
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -976,8 +976,8 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS
gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImportSource* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -994,10 +994,10 @@ gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImport
PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataImportsDataImportSource* self) {
PhotoFileFormat result = 0;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- PhotoFileFormat _tmp2_ = 0;
- PhotoFileFormat _tmp3_ = 0;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ PhotoFileFormat _tmp2_;
+ PhotoFileFormat _tmp3_;
#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0);
#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1020,7 +1020,7 @@ PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataIm
gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self) {
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1036,7 +1036,7 @@ gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImport
time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self) {
time_t result = 0;
time_t _tmp0_ = 0;
- MetadataDateTime* _tmp1_ = NULL;
+ MetadataDateTime* _tmp1_;
#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0);
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1044,8 +1044,8 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp1_ != NULL) {
#line 1047 "DataImportSource.c"
- MetadataDateTime* _tmp2_ = NULL;
- time_t _tmp3_ = 0;
+ MetadataDateTime* _tmp2_;
+ time_t _tmp3_;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp2_ = self->priv->exposure_time;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1054,7 +1054,7 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa
_tmp0_ = _tmp3_;
#line 1056 "DataImportSource.c"
} else {
- time_t _tmp4_ = 0;
+ time_t _tmp4_;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp4_ = self->priv->modification_time;
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1071,7 +1071,7 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa
guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self) {
guint64 result = 0ULL;
- guint64 _tmp0_ = 0ULL;
+ guint64 _tmp0_;
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0ULL);
#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1086,8 +1086,8 @@ guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataIm
SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self) {
SpitDataImportsImportableMediaItem* result = NULL;
- SpitDataImportsImportableMediaItem* _tmp0_ = NULL;
- SpitDataImportsImportableMediaItem* _tmp1_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp0_;
+ SpitDataImportsImportableMediaItem* _tmp1_;
#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1105,7 +1105,7 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho
gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_ = NULL;
+ const gchar* _tmp1_;
#line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), FALSE);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1113,9 +1113,9 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp1_ != NULL) {
#line 1116 "DataImportSource.c"
- const gchar* _tmp2_ = NULL;
- PhotoFileFormat _tmp3_ = 0;
- gboolean _tmp4_ = FALSE;
+ const gchar* _tmp2_;
+ PhotoFileFormat _tmp3_;
+ gboolean _tmp4_;
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp2_ = self->priv->preview_md5;
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1140,7 +1140,7 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor
gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), FALSE);
#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1195,7 +1195,7 @@ static gchar* spit_data_imports_value_data_import_source_collect_value (GValue*
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (collect_values[0].v_pointer) {
#line 1198 "DataImportSource.c"
- SpitDataImportsDataImportSource* object;
+ SpitDataImportsDataImportSource * object;
object = collect_values[0].v_pointer;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (object->parent_instance.g_class == NULL) {
@@ -1222,7 +1222,7 @@ static gchar* spit_data_imports_value_data_import_source_collect_value (GValue*
static gchar* spit_data_imports_value_data_import_source_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- SpitDataImportsDataImportSource** object_p;
+ SpitDataImportsDataImportSource ** object_p;
object_p = collect_values[0].v_pointer;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (!object_p) {
@@ -1274,7 +1274,7 @@ gpointer spit_data_imports_value_get_data_import_source (const GValue* value) {
void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object) {
- SpitDataImportsDataImportSource* old;
+ SpitDataImportsDataImportSource * old;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE));
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1305,7 +1305,7 @@ void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_o
void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object) {
- SpitDataImportsDataImportSource* old;
+ SpitDataImportsDataImportSource * old;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE));
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1357,7 +1357,7 @@ static void spit_data_imports_data_import_source_instance_init (SpitDataImportsD
}
-static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource* obj) {
+static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj) {
SpitDataImportsDataImportSource * self;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, SpitDataImportsDataImportSource);
@@ -1398,7 +1398,7 @@ GType spit_data_imports_data_import_source_get_type (void) {
gpointer spit_data_imports_data_import_source_ref (gpointer instance) {
- SpitDataImportsDataImportSource* self;
+ SpitDataImportsDataImportSource * self;
self = instance;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_atomic_int_inc (&self->ref_count);
@@ -1409,7 +1409,7 @@ gpointer spit_data_imports_data_import_source_ref (gpointer instance) {
void spit_data_imports_data_import_source_unref (gpointer instance) {
- SpitDataImportsDataImportSource* self;
+ SpitDataImportsDataImportSource * self;
self = instance;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index b991c53..34a114f 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -1,4 +1,4 @@
-/* DataImports.c generated by valac 0.34.7, the Vala compiler
+/* DataImports.c generated by valac 0.36.6, the Vala compiler
* generated from DataImports.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@
void data_imports_init (GError** error);
-static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value);
void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
#define RESOURCES_IMPORT "import"
void data_imports_terminate (void);
@@ -34,7 +34,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value) {
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
if ((*length) == (*size)) {
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
@@ -53,15 +53,14 @@ static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* va
void data_imports_init (GError** error) {
gchar** core_ids = NULL;
- gchar** _tmp0_ = NULL;
- gint core_ids_length1 = 0;
- gint _core_ids_size_ = 0;
- gchar** _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gchar** _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
+ gchar** _tmp0_;
+ gint core_ids_length1;
+ gint _core_ids_size_;
+ gchar** _tmp1_;
+ gint _tmp1__length1;
+ gchar* _tmp2_;
+ gchar** _tmp3_;
+ gint _tmp3__length1;
#line 19 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
_tmp0_ = g_new0 (gchar*, 0 + 1);
#line 19 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
@@ -79,16 +78,14 @@ void data_imports_init (GError** error) {
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
_vala_array_add68 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
#line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
- _tmp3_ = _ ("Data Imports");
+ _tmp3_ = core_ids;
#line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
- _tmp4_ = core_ids;
+ _tmp3__length1 = core_ids_length1;
#line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
- _tmp4__length1 = core_ids_length1;
-#line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
- plugins_register_extension_point (SPIT_DATA_IMPORTS_TYPE_SERVICE, _tmp3_, RESOURCES_IMPORT, _tmp4_, _tmp4__length1);
+ plugins_register_extension_point (SPIT_DATA_IMPORTS_TYPE_SERVICE, _ ("Data Imports"), RESOURCES_IMPORT, _tmp3_, _tmp3__length1);
#line 18 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 92 "DataImports.c"
+#line 89 "DataImports.c"
}
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 6fea799..0c9913d 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -1,4 +1,4 @@
-/* DataImportsPluginHost.c generated by valac 0.34.7, the Vala compiler
+/* DataImportsPluginHost.c generated by valac 0.36.6, the Vala compiler
* generated from DataImportsPluginHost.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -452,11 +452,11 @@ struct _ImportManifestClass {
static gpointer spit_data_imports_core_importer_parent_class = NULL;
static gpointer spit_data_imports_concrete_data_imports_host_parent_class = NULL;
-static SpitDataImportsPluginHostIface* spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL;
+static SpitDataImportsPluginHostIface * spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL;
static gpointer spit_data_imports_welcome_data_imports_host_parent_class = NULL;
-static SpitDataImportsPluginHostIface* spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL;
+static SpitDataImportsPluginHostIface * spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL;
static gpointer spit_data_imports_welcome_import_service_entry_parent_class = NULL;
-static WelcomeServiceEntryIface* spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = NULL;
+static WelcomeServiceEntryIface * spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = NULL;
static gpointer spit_data_imports_welcome_import_meta_host_parent_class = NULL;
extern ImportManifest* spit_data_imports_meta_manifest;
ImportManifest* spit_data_imports_meta_manifest = NULL;
@@ -529,7 +529,7 @@ GType library_window_get_type (void) G_GNUC_CONST;
LibraryWindow* library_window_get_app (void);
void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel);
void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self);
-static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter* obj);
+static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj);
GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
GType spit_data_imports_concrete_data_imports_host_get_type (void) G_GNUC_CONST;
GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
@@ -571,7 +571,7 @@ void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* s
static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message);
static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message);
void library_window_switch_to_import_queue_page (LibraryWindow* self);
-static void spit_data_imports_concrete_data_imports_host_finalize (GObject* obj);
+static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj);
GType spit_data_imports_welcome_data_imports_host_get_type (void) G_GNUC_CONST;
GType spit_data_imports_welcome_import_meta_host_get_type (void) G_GNUC_CONST;
#define SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHostPrivate))
@@ -599,7 +599,7 @@ static void spit_data_imports_welcome_data_imports_host_real_update_import_progr
static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message);
static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message);
void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host);
-static void spit_data_imports_welcome_data_imports_host_finalize (GObject* obj);
+static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj);
#define SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntryPrivate))
enum {
SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_DUMMY_PROPERTY
@@ -607,7 +607,7 @@ enum {
static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImportableLibrary** self, int length);
static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base);
static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base);
-static void spit_data_imports_welcome_import_service_entry_finalize (GObject* obj);
+static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj);
GType welcome_dialog_get_type (void) G_GNUC_CONST;
#define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHostPrivate))
enum {
@@ -619,14 +619,14 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1);
gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self);
void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry);
-static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj);
+static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj);
SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1);
GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value);
-static gint __lambda22_ (void* a, void* b);
+static void _vala_array_add69 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value);
+static gint __lambda23_ (void* a, void* b);
gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda22____compar_fn_t (void* key1, void* key2);
+static gint ___lambda23____compar_fn_t (void* key1, void* key2);
GType data_object_get_type (void) G_GNUC_CONST;
GType data_source_get_type (void) G_GNUC_CONST;
GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -657,7 +657,7 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType object_type, SpitDataImportsPluginHost* host) {
SpitDataImportsCoreImporter* self = NULL;
- SpitDataImportsPluginHost* _tmp0_ = NULL;
+ SpitDataImportsPluginHost* _tmp0_;
#line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
#line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -703,28 +703,28 @@ static void _spit_data_imports_data_import_reporter_batch_import_import_reporter
void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
- SpitDataImportsPluginHost* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
- const gchar* _tmp2_ = NULL;
+ SpitDataImportsPluginHost* _tmp0_;
+ gdouble _tmp1_;
+ const gchar* _tmp2_;
SortedList* jobs = NULL;
- SortedList* _tmp3_ = NULL;
+ SortedList* _tmp3_;
GeeArrayList* already_imported = NULL;
- GeeArrayList* _tmp4_ = NULL;
+ GeeArrayList* _tmp4_;
GeeArrayList* failed = NULL;
- GeeArrayList* _tmp5_ = NULL;
+ GeeArrayList* _tmp5_;
gint item_idx = 0;
gdouble item_progress_delta = 0.0;
- gdouble _tmp6_ = 0.0;
- SpitDataImportsImportableMediaItem** _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
- SpitDataImportsImportableMediaItem** _tmp8_ = NULL;
- gint _tmp8__length1 = 0;
- SortedList* _tmp39_ = NULL;
- gint _tmp40_ = 0;
- gint _tmp41_ = 0;
- SpitDataImportsPluginHost* _tmp66_ = NULL;
- gdouble _tmp67_ = 0.0;
- gdouble _tmp68_ = 0.0;
+ gdouble _tmp6_;
+ SpitDataImportsImportableMediaItem** _tmp7_;
+ gint _tmp7__length1;
+ SpitDataImportsImportableMediaItem** _tmp8_;
+ gint _tmp8__length1;
+ SortedList* _tmp39_;
+ gint _tmp40_;
+ gint _tmp41_;
+ SpitDataImportsPluginHost* _tmp65_;
+ gdouble _tmp66_;
+ gdouble _tmp67_;
#line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_CORE_IMPORTER (self));
#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -774,7 +774,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
for (src_item_it = 0; src_item_it < _tmp8__length1; src_item_it = src_item_it + 1) {
#line 777 "DataImportsPluginHost.c"
- SpitDataImportsImportableMediaItem* _tmp9_ = NULL;
+ SpitDataImportsImportableMediaItem* _tmp9_;
SpitDataImportsImportableMediaItem* src_item = NULL;
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp9_ = _g_object_ref0 (src_item_collection[src_item_it]);
@@ -783,21 +783,21 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
#line 784 "DataImportsPluginHost.c"
{
SpitDataImportsDataImportSource* import_source = NULL;
- SpitDataImportsImportableMediaItem* _tmp10_ = NULL;
- SpitDataImportsDataImportSource* _tmp11_ = NULL;
- SpitDataImportsDataImportSource* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
- SpitDataImportsDataImportSource* _tmp21_ = NULL;
- gboolean _tmp22_ = FALSE;
- SortedList* _tmp30_ = NULL;
- SpitDataImportsDataImportSource* _tmp31_ = NULL;
- SpitDataImportsDataImportJob* _tmp32_ = NULL;
- SpitDataImportsDataImportJob* _tmp33_ = NULL;
- gint _tmp34_ = 0;
- SpitDataImportsPluginHost* _tmp35_ = NULL;
- gdouble _tmp36_ = 0.0;
- gint _tmp37_ = 0;
- gdouble _tmp38_ = 0.0;
+ SpitDataImportsImportableMediaItem* _tmp10_;
+ SpitDataImportsDataImportSource* _tmp11_;
+ SpitDataImportsDataImportSource* _tmp12_;
+ gboolean _tmp13_;
+ SpitDataImportsDataImportSource* _tmp21_;
+ gboolean _tmp22_;
+ SortedList* _tmp30_;
+ SpitDataImportsDataImportSource* _tmp31_;
+ SpitDataImportsDataImportJob* _tmp32_;
+ SpitDataImportsDataImportJob* _tmp33_;
+ gint _tmp34_;
+ SpitDataImportsPluginHost* _tmp35_;
+ gdouble _tmp36_;
+ gint _tmp37_;
+ gdouble _tmp38_;
#line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp10_ = src_item;
#line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -811,13 +811,13 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
#line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (!_tmp13_) {
#line 814 "DataImportsPluginHost.c"
- SpitDataImportsDataImportSource* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- GeeArrayList* _tmp17_ = NULL;
- SpitDataImportsDataImportSource* _tmp18_ = NULL;
- SpitDataImportsDataImportJob* _tmp19_ = NULL;
- SpitDataImportsDataImportJob* _tmp20_ = NULL;
+ SpitDataImportsDataImportSource* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ GeeArrayList* _tmp17_;
+ SpitDataImportsDataImportSource* _tmp18_;
+ SpitDataImportsDataImportJob* _tmp19_;
+ SpitDataImportsDataImportJob* _tmp20_;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp14_ = import_source;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -856,13 +856,13 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
#line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp22_) {
#line 858 "DataImportsPluginHost.c"
- SpitDataImportsDataImportSource* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
- GeeArrayList* _tmp26_ = NULL;
- SpitDataImportsDataImportSource* _tmp27_ = NULL;
- SpitDataImportsDataImportJob* _tmp28_ = NULL;
- SpitDataImportsDataImportJob* _tmp29_ = NULL;
+ SpitDataImportsDataImportSource* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
+ GeeArrayList* _tmp26_;
+ SpitDataImportsDataImportSource* _tmp27_;
+ SpitDataImportsDataImportJob* _tmp28_;
+ SpitDataImportsDataImportJob* _tmp29_;
#line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp23_ = import_source;
#line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -937,194 +937,188 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp41_ > 0) {
#line 938 "DataImportsPluginHost.c"
- BatchImportRoll* _tmp42_ = NULL;
+ BatchImportRoll* _tmp42_;
gchar* db_name = NULL;
- const gchar* _tmp44_ = NULL;
- SpitDataImportsPluginHost* _tmp45_ = NULL;
- SpitDataImportsDataImporter* _tmp46_ = NULL;
- SpitDataImportsDataImporter* _tmp47_ = NULL;
- SpitDataImportsService* _tmp48_ = NULL;
- SpitDataImportsService* _tmp49_ = NULL;
- const gchar* _tmp50_ = NULL;
- gchar* _tmp51_ = NULL;
- gchar* _tmp52_ = NULL;
+ SpitDataImportsPluginHost* _tmp44_;
+ SpitDataImportsDataImporter* _tmp45_;
+ SpitDataImportsDataImporter* _tmp46_;
+ SpitDataImportsService* _tmp47_;
+ SpitDataImportsService* _tmp48_;
+ const gchar* _tmp49_;
+ gchar* _tmp50_;
+ gchar* _tmp51_;
BatchImport* batch_import = NULL;
- SortedList* _tmp53_ = NULL;
- const gchar* _tmp54_ = NULL;
- GeeArrayList* _tmp55_ = NULL;
- GeeArrayList* _tmp56_ = NULL;
- BatchImportRoll* _tmp57_ = NULL;
- BatchImport* _tmp58_ = NULL;
- LibraryWindow* _tmp59_ = NULL;
- LibraryWindow* _tmp60_ = NULL;
- BatchImport* _tmp61_ = NULL;
- gint _tmp62_ = 0;
- SortedList* _tmp63_ = NULL;
- gint _tmp64_ = 0;
- gint _tmp65_ = 0;
+ SortedList* _tmp52_;
+ const gchar* _tmp53_;
+ GeeArrayList* _tmp54_;
+ GeeArrayList* _tmp55_;
+ BatchImportRoll* _tmp56_;
+ BatchImport* _tmp57_;
+ LibraryWindow* _tmp58_;
+ LibraryWindow* _tmp59_;
+ BatchImport* _tmp60_;
+ gint _tmp61_;
+ SortedList* _tmp62_;
+ gint _tmp63_;
+ gint _tmp64_;
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp42_ = self->current_import_roll;
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp42_ == NULL) {
-#line 968 "DataImportsPluginHost.c"
- BatchImportRoll* _tmp43_ = NULL;
+#line 967 "DataImportsPluginHost.c"
+ BatchImportRoll* _tmp43_;
#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp43_ = batch_import_roll_new ();
#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_batch_import_roll_unref0 (self->current_import_roll);
#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self->current_import_roll = _tmp43_;
-#line 976 "DataImportsPluginHost.c"
+#line 975 "DataImportsPluginHost.c"
}
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp44_ = _ ("%s Database");
+ _tmp44_ = self->priv->host;
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp45_ = self->priv->host;
+ _tmp45_ = spit_data_imports_plugin_host_get_data_importer (_tmp44_);
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp46_ = spit_data_imports_plugin_host_get_data_importer (_tmp45_);
+ _tmp46_ = _tmp45_;
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp47_ = _tmp46_;
+ _tmp47_ = spit_data_imports_data_importer_get_service (_tmp46_);
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp48_ = spit_data_imports_data_importer_get_service (_tmp47_);
+ _tmp48_ = _tmp47_;
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp49_ = _tmp48_;
+ _tmp49_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp50_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp50_ = g_strdup_printf (_ ("%s Database"), _tmp49_);
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp51_ = g_strdup_printf (_tmp44_, _tmp50_);
+ _tmp51_ = _tmp50_;
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp52_ = _tmp51_;
+ _g_object_unref0 (_tmp48_);
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp49_);
+ _g_object_unref0 (_tmp46_);
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp47_);
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- db_name = _tmp52_;
+ db_name = _tmp51_;
#line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp53_ = jobs;
+ _tmp52_ = jobs;
#line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp54_ = db_name;
+ _tmp53_ = db_name;
#line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp55_ = failed;
+ _tmp54_ = failed;
#line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp56_ = already_imported;
+ _tmp55_ = already_imported;
#line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp57_ = self->current_import_roll;
+ _tmp56_ = self->current_import_roll;
#line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp58_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable), _tmp54_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp55_, _tmp56_, NULL, _tmp57_, NULL);
+ _tmp57_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable), _tmp53_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp54_, _tmp55_, NULL, _tmp56_, NULL);
#line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- batch_import = _tmp58_;
+ batch_import = _tmp57_;
#line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp59_ = library_window_get_app ();
+ _tmp58_ = library_window_get_app ();
#line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp60_ = _tmp59_;
+ _tmp59_ = _tmp58_;
#line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp61_ = batch_import;
+ _tmp60_ = batch_import;
#line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- library_window_enqueue_batch_import (_tmp60_, _tmp61_, TRUE);
+ library_window_enqueue_batch_import (_tmp59_, _tmp60_, TRUE);
#line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp60_);
+ _g_object_unref0 (_tmp59_);
#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp62_ = self->imported_items_count;
+ _tmp61_ = self->imported_items_count;
#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp63_ = jobs;
+ _tmp62_ = jobs;
#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp64_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp63_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection));
#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp65_ = _tmp64_;
+ _tmp64_ = _tmp63_;
#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- self->imported_items_count = _tmp62_ + _tmp65_;
+ self->imported_items_count = _tmp61_ + _tmp64_;
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (batch_import);
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_free0 (db_name);
-#line 1040 "DataImportsPluginHost.c"
+#line 1037 "DataImportsPluginHost.c"
}
#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp66_ = self->priv->host;
+ _tmp65_ = self->priv->host;
#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp67_ = progress;
+ _tmp66_ = progress;
#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp68_ = host_progress_delta;
+ _tmp67_ = host_progress_delta;
#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- spit_data_imports_plugin_host_update_import_progress_pane (_tmp66_, _tmp67_ + _tmp68_, NULL);
+ spit_data_imports_plugin_host_update_import_progress_pane (_tmp65_, _tmp66_ + _tmp67_, NULL);
#line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (failed);
#line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (already_imported);
#line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (jobs);
-#line 1056 "DataImportsPluginHost.c"
+#line 1053 "DataImportsPluginHost.c"
}
void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self) {
gchar* db_name = NULL;
- const gchar* _tmp0_ = NULL;
- SpitDataImportsPluginHost* _tmp1_ = NULL;
- SpitDataImportsDataImporter* _tmp2_ = NULL;
- SpitDataImportsDataImporter* _tmp3_ = NULL;
- SpitDataImportsService* _tmp4_ = NULL;
- SpitDataImportsService* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+ SpitDataImportsPluginHost* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
+ SpitDataImportsDataImporter* _tmp2_;
+ SpitDataImportsService* _tmp3_;
+ SpitDataImportsService* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
BatchImport* batch_import = NULL;
- GeeArrayList* _tmp9_ = NULL;
- GeeArrayList* _tmp10_ = NULL;
- BatchImportRoll* _tmp11_ = NULL;
- BatchImport* _tmp12_ = NULL;
- BatchImport* _tmp13_ = NULL;
- LibraryWindow* _tmp14_ = NULL;
- LibraryWindow* _tmp15_ = NULL;
+ GeeArrayList* _tmp8_;
+ GeeArrayList* _tmp9_;
+ BatchImportRoll* _tmp10_;
+ BatchImport* _tmp11_;
+ BatchImport* _tmp12_;
+ LibraryWindow* _tmp13_;
+ LibraryWindow* _tmp14_;
#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_CORE_IMPORTER (self));
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp0_ = _ ("%s Database");
-#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp1_ = self->priv->host;
+ _tmp0_ = self->priv->host;
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp2_ = spit_data_imports_plugin_host_get_data_importer (_tmp1_);
+ _tmp1_ = spit_data_imports_plugin_host_get_data_importer (_tmp0_);
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp4_ = spit_data_imports_data_importer_get_service (_tmp3_);
+ _tmp3_ = spit_data_imports_data_importer_get_service (_tmp2_);
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp6_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp5_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp7_ = g_strdup_printf (_tmp0_, _tmp6_);
+ _tmp6_ = g_strdup_printf (_ ("%s Database"), _tmp5_);
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp4_);
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- db_name = _tmp8_;
+ db_name = _tmp7_;
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp9_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+ _tmp8_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp11_ = self->current_import_roll;
+ _tmp10_ = self->current_import_roll;
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp12_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable), db_name, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, NULL, NULL, NULL, _tmp11_, NULL);
+ _tmp11_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable), db_name, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, NULL, NULL, NULL, _tmp10_, NULL);
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp9_);
#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- batch_import = _tmp13_;
+ batch_import = _tmp12_;
#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp14_ = library_window_get_app ();
+ _tmp13_ = library_window_get_app ();
#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp15_ = _tmp14_;
+ _tmp14_ = _tmp13_;
#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- library_window_enqueue_batch_import (_tmp15_, batch_import, TRUE);
+ library_window_enqueue_batch_import (_tmp14_, batch_import, TRUE);
#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp15_);
+ _g_object_unref0 (_tmp14_);
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_batch_import_roll_unref0 (self->current_import_roll);
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1133,14 +1127,14 @@ void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporte
_g_object_unref0 (batch_import);
#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_free0 (db_name);
-#line 1135 "DataImportsPluginHost.c"
+#line 1129 "DataImportsPluginHost.c"
}
static void spit_data_imports_value_core_importer_init (GValue* value) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
value->data[0].v_pointer = NULL;
-#line 1142 "DataImportsPluginHost.c"
+#line 1136 "DataImportsPluginHost.c"
}
@@ -1149,7 +1143,7 @@ static void spit_data_imports_value_core_importer_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_core_importer_unref (value->data[0].v_pointer);
-#line 1151 "DataImportsPluginHost.c"
+#line 1145 "DataImportsPluginHost.c"
}
}
@@ -1159,11 +1153,11 @@ static void spit_data_imports_value_core_importer_copy_value (const GValue* src_
if (src_value->data[0].v_pointer) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
dest_value->data[0].v_pointer = spit_data_imports_core_importer_ref (src_value->data[0].v_pointer);
-#line 1161 "DataImportsPluginHost.c"
+#line 1155 "DataImportsPluginHost.c"
} else {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1165 "DataImportsPluginHost.c"
+#line 1159 "DataImportsPluginHost.c"
}
}
@@ -1171,66 +1165,66 @@ static void spit_data_imports_value_core_importer_copy_value (const GValue* src_
static gpointer spit_data_imports_value_core_importer_peek_pointer (const GValue* value) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return value->data[0].v_pointer;
-#line 1173 "DataImportsPluginHost.c"
+#line 1167 "DataImportsPluginHost.c"
}
static gchar* spit_data_imports_value_core_importer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (collect_values[0].v_pointer) {
-#line 1180 "DataImportsPluginHost.c"
- SpitDataImportsCoreImporter* object;
+#line 1174 "DataImportsPluginHost.c"
+ SpitDataImportsCoreImporter * object;
object = collect_values[0].v_pointer;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (object->parent_instance.g_class == NULL) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1187 "DataImportsPluginHost.c"
+#line 1181 "DataImportsPluginHost.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.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 1191 "DataImportsPluginHost.c"
+#line 1185 "DataImportsPluginHost.c"
}
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
value->data[0].v_pointer = spit_data_imports_core_importer_ref (object);
-#line 1195 "DataImportsPluginHost.c"
+#line 1189 "DataImportsPluginHost.c"
} else {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
value->data[0].v_pointer = NULL;
-#line 1199 "DataImportsPluginHost.c"
+#line 1193 "DataImportsPluginHost.c"
}
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return NULL;
-#line 1203 "DataImportsPluginHost.c"
+#line 1197 "DataImportsPluginHost.c"
}
static gchar* spit_data_imports_value_core_importer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- SpitDataImportsCoreImporter** object_p;
+ SpitDataImportsCoreImporter ** object_p;
object_p = collect_values[0].v_pointer;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (!object_p) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1214 "DataImportsPluginHost.c"
+#line 1208 "DataImportsPluginHost.c"
}
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (!value->data[0].v_pointer) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
*object_p = NULL;
-#line 1220 "DataImportsPluginHost.c"
+#line 1214 "DataImportsPluginHost.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
*object_p = value->data[0].v_pointer;
-#line 1224 "DataImportsPluginHost.c"
+#line 1218 "DataImportsPluginHost.c"
} else {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
*object_p = spit_data_imports_core_importer_ref (value->data[0].v_pointer);
-#line 1228 "DataImportsPluginHost.c"
+#line 1222 "DataImportsPluginHost.c"
}
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return NULL;
-#line 1232 "DataImportsPluginHost.c"
+#line 1226 "DataImportsPluginHost.c"
}
@@ -1244,7 +1238,7 @@ GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return G_PARAM_SPEC (spec);
-#line 1246 "DataImportsPluginHost.c"
+#line 1240 "DataImportsPluginHost.c"
}
@@ -1253,12 +1247,12 @@ gpointer spit_data_imports_value_get_core_importer (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER), NULL);
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return value->data[0].v_pointer;
-#line 1255 "DataImportsPluginHost.c"
+#line 1249 "DataImportsPluginHost.c"
}
void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object) {
- SpitDataImportsCoreImporter* old;
+ SpitDataImportsCoreImporter * old;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER));
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1273,23 +1267,23 @@ void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object
value->data[0].v_pointer = v_object;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_core_importer_ref (value->data[0].v_pointer);
-#line 1275 "DataImportsPluginHost.c"
+#line 1269 "DataImportsPluginHost.c"
} else {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
value->data[0].v_pointer = NULL;
-#line 1279 "DataImportsPluginHost.c"
+#line 1273 "DataImportsPluginHost.c"
}
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (old) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_core_importer_unref (old);
-#line 1285 "DataImportsPluginHost.c"
+#line 1279 "DataImportsPluginHost.c"
}
}
void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_object) {
- SpitDataImportsCoreImporter* old;
+ SpitDataImportsCoreImporter * old;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER));
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1302,17 +1296,17 @@ void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_objec
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
value->data[0].v_pointer = v_object;
-#line 1304 "DataImportsPluginHost.c"
+#line 1298 "DataImportsPluginHost.c"
} else {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
value->data[0].v_pointer = NULL;
-#line 1308 "DataImportsPluginHost.c"
+#line 1302 "DataImportsPluginHost.c"
}
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (old) {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_core_importer_unref (old);
-#line 1314 "DataImportsPluginHost.c"
+#line 1308 "DataImportsPluginHost.c"
}
}
@@ -1324,7 +1318,7 @@ static void spit_data_imports_core_importer_class_init (SpitDataImportsCoreImpor
((SpitDataImportsCoreImporterClass *) klass)->finalize = spit_data_imports_core_importer_finalize;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_type_class_add_private (klass, sizeof (SpitDataImportsCoreImporterPrivate));
-#line 1326 "DataImportsPluginHost.c"
+#line 1320 "DataImportsPluginHost.c"
}
@@ -1337,11 +1331,11 @@ static void spit_data_imports_core_importer_instance_init (SpitDataImportsCoreIm
self->current_import_roll = NULL;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self->ref_count = 1;
-#line 1339 "DataImportsPluginHost.c"
+#line 1333 "DataImportsPluginHost.c"
}
-static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter* obj) {
+static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj) {
SpitDataImportsCoreImporter * self;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, SpitDataImportsCoreImporter);
@@ -1349,7 +1343,7 @@ static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporte
g_signal_handlers_destroy (self);
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_batch_import_roll_unref0 (self->current_import_roll);
-#line 1351 "DataImportsPluginHost.c"
+#line 1345 "DataImportsPluginHost.c"
}
@@ -1368,18 +1362,18 @@ GType spit_data_imports_core_importer_get_type (void) {
gpointer spit_data_imports_core_importer_ref (gpointer instance) {
- SpitDataImportsCoreImporter* self;
+ SpitDataImportsCoreImporter * self;
self = instance;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_atomic_int_inc (&self->ref_count);
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return instance;
-#line 1376 "DataImportsPluginHost.c"
+#line 1370 "DataImportsPluginHost.c"
}
void spit_data_imports_core_importer_unref (gpointer instance) {
- SpitDataImportsCoreImporter* self;
+ SpitDataImportsCoreImporter * self;
self = instance;
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1387,18 +1381,18 @@ void spit_data_imports_core_importer_unref (gpointer instance) {
SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_CLASS (self)->finalize (self);
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1389 "DataImportsPluginHost.c"
+#line 1383 "DataImportsPluginHost.c"
}
}
SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) {
SpitDataImportsConcreteDataImportsHost * self = NULL;
- SpitDataImportsService* _tmp0_ = NULL;
- DataImportsUIDataImportsDialog* _tmp1_ = NULL;
- SpitDataImportsService* _tmp2_ = NULL;
- SpitDataImportsDataImporter* _tmp3_ = NULL;
- SpitDataImportsCoreImporter* _tmp4_ = NULL;
+ SpitDataImportsService* _tmp0_;
+ DataImportsUIDataImportsDialog* _tmp1_;
+ SpitDataImportsService* _tmp2_;
+ SpitDataImportsDataImporter* _tmp3_;
+ SpitDataImportsCoreImporter* _tmp4_;
#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL);
#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1427,22 +1421,22 @@ SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_
self->priv->core_importer = _tmp4_;
#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return self;
-#line 1429 "DataImportsPluginHost.c"
+#line 1423 "DataImportsPluginHost.c"
}
SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) {
#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return spit_data_imports_concrete_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, service, dialog);
-#line 1436 "DataImportsPluginHost.c"
+#line 1430 "DataImportsPluginHost.c"
}
static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) {
SpitDataImportsConcreteDataImportsHost * self;
SpitDataImportsDataImporter* result = NULL;
- SpitDataImportsDataImporter* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
+ SpitDataImportsDataImporter* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
#line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1453,18 +1447,18 @@ static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host
result = _tmp1_;
#line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 1455 "DataImportsPluginHost.c"
+#line 1449 "DataImportsPluginHost.c"
}
static void spit_data_imports_concrete_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) {
SpitDataImportsConcreteDataImportsHost * self;
- SpitDataImportsDataImporter* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
- SpitDataImportsDataImporter* _tmp4_ = NULL;
- SpitDataImportsDataImporter* _tmp5_ = NULL;
+ SpitDataImportsDataImporter* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
+ gboolean _tmp2_;
+ gboolean _tmp3_;
+ SpitDataImportsDataImporter* _tmp4_;
+ SpitDataImportsDataImporter* _tmp5_;
#line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1481,7 +1475,7 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S
if (_tmp3_) {
#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return;
-#line 1483 "DataImportsPluginHost.c"
+#line 1477 "DataImportsPluginHost.c"
}
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_debug ("DataImportsPluginHost.vala:112: ConcreteDataImportsHost.start_importin" \
@@ -1494,16 +1488,16 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S
spit_data_imports_data_importer_start (_tmp5_);
#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_tmp5_);
-#line 1495 "DataImportsPluginHost.c"
+#line 1489 "DataImportsPluginHost.c"
}
static void spit_data_imports_concrete_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) {
SpitDataImportsConcreteDataImportsHost * self;
- SpitDataImportsDataImporter* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
+ SpitDataImportsDataImporter* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
+ gboolean _tmp2_;
+ gboolean _tmp3_;
#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1521,9 +1515,9 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp
_g_object_unref0 (_tmp1_);
#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp3_) {
-#line 1521 "DataImportsPluginHost.c"
- SpitDataImportsDataImporter* _tmp4_ = NULL;
- SpitDataImportsDataImporter* _tmp5_ = NULL;
+#line 1515 "DataImportsPluginHost.c"
+ SpitDataImportsDataImporter* _tmp4_;
+ SpitDataImportsDataImporter* _tmp5_;
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1532,13 +1526,13 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp
spit_data_imports_data_importer_stop (_tmp5_);
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_tmp5_);
-#line 1532 "DataImportsPluginHost.c"
+#line 1526 "DataImportsPluginHost.c"
}
#line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_concrete_data_imports_host_clean_up (self);
#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self->priv->importing_halted = TRUE;
-#line 1538 "DataImportsPluginHost.c"
+#line 1532 "DataImportsPluginHost.c"
}
@@ -1549,43 +1543,43 @@ static void spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImpor
_g_object_unref0 (self->priv->progress_pane);
#line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self->priv->progress_pane = NULL;
-#line 1549 "DataImportsPluginHost.c"
+#line 1543 "DataImportsPluginHost.c"
}
void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self, SpitDataImportsPluginHostButtonMode mode) {
- SpitDataImportsPluginHostButtonMode _tmp0_ = 0;
+ SpitDataImportsPluginHostButtonMode _tmp0_;
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_CONCRETE_DATA_IMPORTS_HOST (self));
#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = mode;
#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp0_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
-#line 1561 "DataImportsPluginHost.c"
- DataImportsUIDataImportsDialog* _tmp1_ = NULL;
+#line 1555 "DataImportsPluginHost.c"
+ DataImportsUIDataImportsDialog* _tmp1_;
#line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp1_ = self->priv->dialog;
#line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp1_);
-#line 1567 "DataImportsPluginHost.c"
+#line 1561 "DataImportsPluginHost.c"
} else {
- SpitDataImportsPluginHostButtonMode _tmp2_ = 0;
+ SpitDataImportsPluginHostButtonMode _tmp2_;
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp2_ = mode;
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp2_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL) {
-#line 1574 "DataImportsPluginHost.c"
- DataImportsUIDataImportsDialog* _tmp3_ = NULL;
+#line 1568 "DataImportsPluginHost.c"
+ DataImportsUIDataImportsDialog* _tmp3_;
#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp3_ = self->priv->dialog;
#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
data_imports_ui_data_imports_dialog_set_cancel_button_mode (_tmp3_);
-#line 1580 "DataImportsPluginHost.c"
+#line 1574 "DataImportsPluginHost.c"
} else {
#line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_error ("DataImportsPluginHost.vala:138: unrecognized button mode enumeration v" \
"alue");
-#line 1584 "DataImportsPluginHost.c"
+#line 1578 "DataImportsPluginHost.c"
}
}
}
@@ -1593,8 +1587,8 @@ void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImpor
static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) {
SpitDataImportsConcreteDataImportsHost * self;
- GError* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ GError* _tmp0_;
+ const gchar* _tmp1_;
#line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1603,129 +1597,123 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDa
_tmp1_ = _tmp0_->message;
#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_);
-#line 1602 "DataImportsPluginHost.c"
+#line 1596 "DataImportsPluginHost.c"
}
static void spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) {
SpitDataImportsConcreteDataImportsHost * self;
gchar* msg = NULL;
- const gchar* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- SpitDataImportsService* _tmp2_ = NULL;
- SpitDataImportsService* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- DataImportsUIDataImportsDialog* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- DataImportsUIStaticMessagePane* _tmp17_ = NULL;
- DataImportsUIStaticMessagePane* _tmp18_ = NULL;
- DataImportsUIDataImportsDialog* _tmp19_ = NULL;
- DataImportsUIDataImportsDialog* _tmp20_ = NULL;
- SpitDataImportsDataImporter* _tmp21_ = NULL;
- SpitDataImportsDataImporter* _tmp22_ = NULL;
+ SpitDataImportsDataImporter* _tmp0_;
+ SpitDataImportsService* _tmp1_;
+ SpitDataImportsService* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ const gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ const gchar* _tmp11_;
+ gchar* _tmp12_;
+ DataImportsUIDataImportsDialog* _tmp13_;
+ const gchar* _tmp14_;
+ DataImportsUIStaticMessagePane* _tmp15_;
+ DataImportsUIStaticMessagePane* _tmp16_;
+ DataImportsUIDataImportsDialog* _tmp17_;
+ DataImportsUIDataImportsDialog* _tmp18_;
+ SpitDataImportsDataImporter* _tmp19_;
+ SpitDataImportsDataImporter* _tmp20_;
#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (message != NULL);
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp0_ = _ ("Importing from %s can’t continue because an error occurred:");
-#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp1_ = self->priv->active_importer;
+ _tmp0_ = self->priv->active_importer;
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp2_ = spit_data_imports_data_importer_get_service (_tmp1_);
+ _tmp1_ = spit_data_imports_data_importer_get_service (_tmp0_);
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
+ _tmp4_ = g_strdup_printf (_ ("Importing from %s can’t continue because an error occurred:"), _tmp3_);
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- msg = _tmp6_;
+ msg = _tmp5_;
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp7_ = msg;
+ _tmp6_ = msg;
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp8_ = message;
+ _tmp7_ = message;
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp9_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp8_);
+ _tmp8_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp7_);
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp11_ = g_strconcat (_tmp7_, _tmp10_, NULL);
+ _tmp10_ = g_strconcat (_tmp6_, _tmp9_, NULL);
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_free0 (msg);
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- msg = _tmp11_;
+ msg = _tmp10_;
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_free0 (_tmp10_);
-#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp12_ = msg;
+ _g_free0 (_tmp9_);
#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp13_ = _ ("To try importing from another service, select one from the above menu.");
+ _tmp11_ = msg;
#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp14_ = g_strconcat (_tmp12_, _tmp13_, NULL);
+ _tmp12_ = g_strconcat (_tmp11_, _ ("To try importing from another service, select one from the above menu."), NULL);
#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_free0 (msg);
#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- msg = _tmp14_;
+ msg = _tmp12_;
#line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp15_ = self->priv->dialog;
+ _tmp13_ = self->priv->dialog;
#line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp16_ = msg;
+ _tmp14_ = msg;
#line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp17_ = data_imports_ui_static_message_pane_new_with_pango (_tmp16_);
+ _tmp15_ = data_imports_ui_static_message_pane_new_with_pango (_tmp14_);
#line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp18_ = _tmp17_;
+ _tmp16_ = _tmp15_;
#line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- data_imports_ui_data_imports_dialog_install_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+ data_imports_ui_data_imports_dialog_install_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
#line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp18_);
+ _g_object_unref0 (_tmp16_);
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp19_ = self->priv->dialog;
+ _tmp17_ = self->priv->dialog;
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp19_);
+ data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp17_);
#line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp20_ = self->priv->dialog;
+ _tmp18_ = self->priv->dialog;
#line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- data_imports_ui_data_imports_dialog_unlock_service (_tmp20_);
+ data_imports_ui_data_imports_dialog_unlock_service (_tmp18_);
#line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp21_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+ _tmp19_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
#line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp22_ = _tmp21_;
+ _tmp20_ = _tmp19_;
#line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- spit_data_imports_data_importer_stop (_tmp22_);
+ spit_data_imports_data_importer_stop (_tmp20_);
#line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp22_);
+ _g_object_unref0 (_tmp20_);
#line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_concrete_data_imports_host_clean_up (self);
#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_free0 (msg);
-#line 1712 "DataImportsPluginHost.c"
+#line 1700 "DataImportsPluginHost.c"
}
static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode) {
SpitDataImportsConcreteDataImportsHost * self;
gboolean _tmp0_ = FALSE;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- SpitDataImportsDataImporter* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- DataImportsUIDataImportsDialog* _tmp7_ = NULL;
- SpitDataImportsDialogPane* _tmp8_ = NULL;
- SpitDataImportsPluginHostButtonMode _tmp9_ = 0;
+ SpitDataImportsDataImporter* _tmp1_;
+ SpitDataImportsDataImporter* _tmp2_;
+ gboolean _tmp3_;
+ DataImportsUIDataImportsDialog* _tmp7_;
+ SpitDataImportsDialogPane* _tmp8_;
+ SpitDataImportsPluginHostButtonMode _tmp9_;
#line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1745,11 +1733,11 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
if (_tmp3_) {
#line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = TRUE;
-#line 1743 "DataImportsPluginHost.c"
+#line 1731 "DataImportsPluginHost.c"
} else {
- SpitDataImportsDataImporter* _tmp4_ = NULL;
- SpitDataImportsDataImporter* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+ SpitDataImportsDataImporter* _tmp4_;
+ SpitDataImportsDataImporter* _tmp5_;
+ gboolean _tmp6_;
#line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
#line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1760,13 +1748,13 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
_tmp0_ = !_tmp6_;
#line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_tmp5_);
-#line 1758 "DataImportsPluginHost.c"
+#line 1746 "DataImportsPluginHost.c"
}
#line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp0_) {
#line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return;
-#line 1764 "DataImportsPluginHost.c"
+#line 1752 "DataImportsPluginHost.c"
}
#line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp7_ = self->priv->dialog;
@@ -1778,17 +1766,17 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
_tmp9_ = button_mode;
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_concrete_data_imports_host_set_button_mode (self, _tmp9_);
-#line 1776 "DataImportsPluginHost.c"
+#line 1764 "DataImportsPluginHost.c"
}
static void spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode) {
SpitDataImportsConcreteDataImportsHost * self;
- SpitDataImportsPluginHostButtonMode _tmp0_ = 0;
- DataImportsUIDataImportsDialog* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- DataImportsUIStaticMessagePane* _tmp3_ = NULL;
- DataImportsUIStaticMessagePane* _tmp4_ = NULL;
+ SpitDataImportsPluginHostButtonMode _tmp0_;
+ DataImportsUIDataImportsDialog* _tmp1_;
+ const gchar* _tmp2_;
+ DataImportsUIStaticMessagePane* _tmp3_;
+ DataImportsUIStaticMessagePane* _tmp4_;
#line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1809,15 +1797,15 @@ static void spit_data_imports_concrete_data_imports_host_real_install_static_mes
data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
#line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_tmp4_);
-#line 1807 "DataImportsPluginHost.c"
+#line 1795 "DataImportsPluginHost.c"
}
static void spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
SpitDataImportsConcreteDataImportsHost * self;
gboolean _tmp0_ = FALSE;
- SpitDataImportsImportableLibrary** _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
+ SpitDataImportsImportableLibrary** _tmp1_;
+ gint _tmp1__length1;
#line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1828,31 +1816,31 @@ static void spit_data_imports_concrete_data_imports_host_real_install_library_se
_tmp1__length1 = discovered_libraries_length1;
#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp1__length1 == 0) {
-#line 1826 "DataImportsPluginHost.c"
- const gchar* _tmp2_ = NULL;
+#line 1814 "DataImportsPluginHost.c"
+ const gchar* _tmp2_;
#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp2_ = file_select_label;
#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = _tmp2_ == NULL;
-#line 1832 "DataImportsPluginHost.c"
+#line 1820 "DataImportsPluginHost.c"
} else {
#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = FALSE;
-#line 1836 "DataImportsPluginHost.c"
+#line 1824 "DataImportsPluginHost.c"
}
#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp0_) {
#line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), "Libraries or file option needed");
-#line 1842 "DataImportsPluginHost.c"
+#line 1830 "DataImportsPluginHost.c"
} else {
- DataImportsUIDataImportsDialog* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- SpitDataImportsImportableLibrary** _tmp5_ = NULL;
- gint _tmp5__length1 = 0;
- const gchar* _tmp6_ = NULL;
- DataImportsUILibrarySelectionPane* _tmp7_ = NULL;
- DataImportsUILibrarySelectionPane* _tmp8_ = NULL;
+ DataImportsUIDataImportsDialog* _tmp3_;
+ const gchar* _tmp4_;
+ SpitDataImportsImportableLibrary** _tmp5_;
+ gint _tmp5__length1;
+ const gchar* _tmp6_;
+ DataImportsUILibrarySelectionPane* _tmp7_;
+ DataImportsUILibrarySelectionPane* _tmp8_;
#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp3_ = self->priv->dialog;
#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1871,22 +1859,22 @@ static void spit_data_imports_concrete_data_imports_host_real_install_library_se
data_imports_ui_data_imports_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_tmp8_);
-#line 1869 "DataImportsPluginHost.c"
+#line 1857 "DataImportsPluginHost.c"
}
#line 199 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 1873 "DataImportsPluginHost.c"
+#line 1861 "DataImportsPluginHost.c"
}
static void spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message) {
SpitDataImportsConcreteDataImportsHost * self;
- const gchar* _tmp0_ = NULL;
- DataImportsUIProgressPane* _tmp1_ = NULL;
- DataImportsUIDataImportsDialog* _tmp2_ = NULL;
- DataImportsUIProgressPane* _tmp3_ = NULL;
- SpitDataImportsCoreImporter* _tmp4_ = NULL;
- SpitDataImportsCoreImporter* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ DataImportsUIProgressPane* _tmp1_;
+ DataImportsUIDataImportsDialog* _tmp2_;
+ DataImportsUIProgressPane* _tmp3_;
+ SpitDataImportsCoreImporter* _tmp4_;
+ SpitDataImportsCoreImporter* _tmp5_;
#line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1917,23 +1905,23 @@ static void spit_data_imports_concrete_data_imports_host_real_install_import_pro
_batch_import_roll_unref0 (_tmp5_->current_import_roll);
#line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp5_->current_import_roll = NULL;
-#line 1915 "DataImportsPluginHost.c"
+#line 1903 "DataImportsPluginHost.c"
}
static void spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message) {
SpitDataImportsConcreteDataImportsHost * self;
- DataImportsUIProgressPane* _tmp0_ = NULL;
+ DataImportsUIProgressPane* _tmp0_;
#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = self->priv->progress_pane;
#line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp0_ != NULL) {
-#line 1928 "DataImportsPluginHost.c"
- DataImportsUIProgressPane* _tmp1_ = NULL;
- gdouble _tmp2_ = 0.0;
- const gchar* _tmp3_ = NULL;
+#line 1916 "DataImportsPluginHost.c"
+ DataImportsUIProgressPane* _tmp1_;
+ gdouble _tmp2_;
+ const gchar* _tmp3_;
#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp1_ = self->priv->progress_pane;
#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1942,19 +1930,19 @@ static void spit_data_imports_concrete_data_imports_host_real_update_import_prog
_tmp3_ = progress_message;
#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
data_imports_ui_progress_pane_update_progress (_tmp1_, _tmp2_, _tmp3_);
-#line 1940 "DataImportsPluginHost.c"
+#line 1928 "DataImportsPluginHost.c"
}
}
static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
SpitDataImportsConcreteDataImportsHost * self;
- SpitDataImportsCoreImporter* _tmp0_ = NULL;
- SpitDataImportsImportableMediaItem** _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- gdouble _tmp2_ = 0.0;
- gdouble _tmp3_ = 0.0;
- const gchar* _tmp4_ = NULL;
+ SpitDataImportsCoreImporter* _tmp0_;
+ SpitDataImportsImportableMediaItem** _tmp1_;
+ gint _tmp1__length1;
+ gdouble _tmp2_;
+ gdouble _tmp3_;
+ const gchar* _tmp4_;
#line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1971,20 +1959,20 @@ static void spit_data_imports_concrete_data_imports_host_real_prepare_media_item
_tmp4_ = progress_message;
#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_);
-#line 1969 "DataImportsPluginHost.c"
+#line 1957 "DataImportsPluginHost.c"
}
static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) {
SpitDataImportsConcreteDataImportsHost * self;
- const gchar* _tmp0_ = NULL;
- SpitDataImportsCoreImporter* _tmp1_ = NULL;
- SpitDataImportsImportedItemsCountCallback _tmp2_ = NULL;
- void* _tmp2__target = NULL;
- SpitDataImportsCoreImporter* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- SpitDataImportsCoreImporter* _tmp5_ = NULL;
- gint _tmp6_ = 0;
+ const gchar* _tmp0_;
+ SpitDataImportsCoreImporter* _tmp1_;
+ SpitDataImportsImportedItemsCountCallback _tmp2_;
+ void* _tmp2__target;
+ SpitDataImportsCoreImporter* _tmp3_;
+ gint _tmp4_;
+ SpitDataImportsCoreImporter* _tmp5_;
+ gint _tmp6_;
#line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
#line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2013,9 +2001,9 @@ static void spit_data_imports_concrete_data_imports_host_real_finalize_import (S
_tmp6_ = _tmp5_->imported_items_count;
#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp6_ > 0) {
-#line 2011 "DataImportsPluginHost.c"
- LibraryWindow* _tmp7_ = NULL;
- LibraryWindow* _tmp8_ = NULL;
+#line 1999 "DataImportsPluginHost.c"
+ LibraryWindow* _tmp7_;
+ LibraryWindow* _tmp8_;
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp7_ = library_window_get_app ();
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2024,7 +2012,7 @@ static void spit_data_imports_concrete_data_imports_host_real_finalize_import (S
library_window_switch_to_import_queue_page (_tmp8_);
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_tmp8_);
-#line 2022 "DataImportsPluginHost.c"
+#line 2010 "DataImportsPluginHost.c"
}
}
@@ -2036,7 +2024,7 @@ static void spit_data_imports_concrete_data_imports_host_class_init (SpitDataImp
g_type_class_add_private (klass, sizeof (SpitDataImportsConcreteDataImportsHostPrivate));
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
G_OBJECT_CLASS (klass)->finalize = spit_data_imports_concrete_data_imports_host_finalize;
-#line 2034 "DataImportsPluginHost.c"
+#line 2022 "DataImportsPluginHost.c"
}
@@ -2044,30 +2032,30 @@ static void spit_data_imports_concrete_data_imports_host_spit_data_imports_plugi
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface);
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->get_data_importer = (SpitDataImportsDataImporter* (*)(SpitDataImportsPluginHost*)) spit_data_imports_concrete_data_imports_host_real_get_data_importer;
+ iface->get_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsPluginHost *)) spit_data_imports_concrete_data_imports_host_real_get_data_importer;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->start_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_concrete_data_imports_host_real_start_importing;
+ iface->start_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_concrete_data_imports_host_real_start_importing;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->stop_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_concrete_data_imports_host_real_stop_importing;
+ iface->stop_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_concrete_data_imports_host_real_stop_importing;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->post_error = (void (*)(SpitDataImportsPluginHost*, GError*)) spit_data_imports_concrete_data_imports_host_real_post_error;
+ iface->post_error = (void (*) (SpitDataImportsPluginHost *, GError*)) spit_data_imports_concrete_data_imports_host_real_post_error;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->post_error_message = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_post_error_message;
+ iface->post_error_message = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_concrete_data_imports_host_real_post_error_message;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->install_dialog_pane = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_dialog_pane;
+ iface->install_dialog_pane = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_dialog_pane;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->install_static_message_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_static_message_pane;
+ iface->install_static_message_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_static_message_pane;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->install_library_selection_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane;
+ iface->install_library_selection_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->install_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane;
+ iface->install_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->update_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane;
+ iface->update_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->prepare_media_items_for_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import;
+ iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->finalize_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_finalize_import;
-#line 2065 "DataImportsPluginHost.c"
+ iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_finalize_import;
+#line 2053 "DataImportsPluginHost.c"
}
@@ -2082,11 +2070,11 @@ static void spit_data_imports_concrete_data_imports_host_instance_init (SpitData
self->priv->progress_pane = NULL;
#line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self->priv->importing_halted = FALSE;
-#line 2080 "DataImportsPluginHost.c"
+#line 2068 "DataImportsPluginHost.c"
}
-static void spit_data_imports_concrete_data_imports_host_finalize (GObject* obj) {
+static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj) {
SpitDataImportsConcreteDataImportsHost * self;
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
@@ -2098,7 +2086,7 @@ static void spit_data_imports_concrete_data_imports_host_finalize (GObject* obj)
_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
#line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
G_OBJECT_CLASS (spit_data_imports_concrete_data_imports_host_parent_class)->finalize (obj);
-#line 2096 "DataImportsPluginHost.c"
+#line 2084 "DataImportsPluginHost.c"
}
@@ -2118,11 +2106,11 @@ GType spit_data_imports_concrete_data_imports_host_get_type (void) {
SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) {
SpitDataImportsWelcomeDataImportsHost * self = NULL;
- SpitDataImportsService* _tmp0_ = NULL;
- SpitDataImportsService* _tmp1_ = NULL;
- SpitDataImportsDataImporter* _tmp2_ = NULL;
- SpitDataImportsCoreImporter* _tmp3_ = NULL;
- SpitDataImportsWelcomeImportMetaHost* _tmp4_ = NULL;
+ SpitDataImportsService* _tmp0_;
+ SpitDataImportsService* _tmp1_;
+ SpitDataImportsDataImporter* _tmp2_;
+ SpitDataImportsCoreImporter* _tmp3_;
+ SpitDataImportsWelcomeImportMetaHost* _tmp4_;
#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL);
#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2151,22 +2139,22 @@ SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_ho
self->priv->meta_host = _tmp4_;
#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return self;
-#line 2149 "DataImportsPluginHost.c"
+#line 2137 "DataImportsPluginHost.c"
}
SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) {
#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return spit_data_imports_welcome_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, service, meta_host);
-#line 2156 "DataImportsPluginHost.c"
+#line 2144 "DataImportsPluginHost.c"
}
static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) {
SpitDataImportsWelcomeDataImportsHost * self;
SpitDataImportsDataImporter* result = NULL;
- SpitDataImportsDataImporter* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
+ SpitDataImportsDataImporter* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
#line 260 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 261 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2177,18 +2165,18 @@ static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_
result = _tmp1_;
#line 261 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 2175 "DataImportsPluginHost.c"
+#line 2163 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) {
SpitDataImportsWelcomeDataImportsHost * self;
- SpitDataImportsDataImporter* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
- SpitDataImportsDataImporter* _tmp4_ = NULL;
- SpitDataImportsDataImporter* _tmp5_ = NULL;
+ SpitDataImportsDataImporter* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
+ gboolean _tmp2_;
+ gboolean _tmp3_;
+ SpitDataImportsDataImporter* _tmp4_;
+ SpitDataImportsDataImporter* _tmp5_;
#line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2205,7 +2193,7 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp
if (_tmp3_) {
#line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return;
-#line 2203 "DataImportsPluginHost.c"
+#line 2191 "DataImportsPluginHost.c"
}
#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_debug ("DataImportsPluginHost.vala:268: WelcomeDataImportsHost.start_importing" \
@@ -2218,16 +2206,16 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp
spit_data_imports_data_importer_start (_tmp5_);
#line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_tmp5_);
-#line 2215 "DataImportsPluginHost.c"
+#line 2203 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) {
SpitDataImportsWelcomeDataImportsHost * self;
- SpitDataImportsDataImporter* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
+ SpitDataImportsDataImporter* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
+ gboolean _tmp2_;
+ gboolean _tmp3_;
#line 273 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 274 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2245,9 +2233,9 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi
_g_object_unref0 (_tmp1_);
#line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp3_) {
-#line 2241 "DataImportsPluginHost.c"
- SpitDataImportsDataImporter* _tmp4_ = NULL;
- SpitDataImportsDataImporter* _tmp5_ = NULL;
+#line 2229 "DataImportsPluginHost.c"
+ SpitDataImportsDataImporter* _tmp4_;
+ SpitDataImportsDataImporter* _tmp5_;
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2256,27 +2244,27 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi
spit_data_imports_data_importer_stop (_tmp5_);
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_tmp5_);
-#line 2252 "DataImportsPluginHost.c"
+#line 2240 "DataImportsPluginHost.c"
}
#line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_welcome_data_imports_host_clean_up (self);
#line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self->priv->importing_halted = TRUE;
-#line 2258 "DataImportsPluginHost.c"
+#line 2246 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self) {
#line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_DATA_IMPORTS_HOST (self));
-#line 2265 "DataImportsPluginHost.c"
+#line 2253 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) {
SpitDataImportsWelcomeDataImportsHost * self;
- GError* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ GError* _tmp0_;
+ const gchar* _tmp1_;
#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2285,59 +2273,56 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDat
_tmp1_ = _tmp0_->message;
#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_);
-#line 2281 "DataImportsPluginHost.c"
+#line 2269 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) {
SpitDataImportsWelcomeDataImportsHost * self;
gchar* msg = NULL;
- const gchar* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- SpitDataImportsService* _tmp2_ = NULL;
- SpitDataImportsService* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- SpitDataImportsDataImporter* _tmp7_ = NULL;
- SpitDataImportsDataImporter* _tmp8_ = NULL;
+ SpitDataImportsDataImporter* _tmp0_;
+ SpitDataImportsService* _tmp1_;
+ SpitDataImportsService* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ SpitDataImportsDataImporter* _tmp6_;
+ SpitDataImportsDataImporter* _tmp7_;
#line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (message != NULL);
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp0_ = _ ("Importing from %s can’t continue because an error occurred:");
-#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp1_ = self->priv->active_importer;
+ _tmp0_ = self->priv->active_importer;
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp2_ = spit_data_imports_data_importer_get_service (_tmp1_);
+ _tmp1_ = spit_data_imports_data_importer_get_service (_tmp0_);
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
+ _tmp4_ = g_strdup_printf (_ ("Importing from %s can’t continue because an error occurred:"), _tmp3_);
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- msg = _tmp6_;
+ msg = _tmp5_;
#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_debug ("DataImportsPluginHost.vala:297: %s", msg);
#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp7_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+ _tmp6_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- spit_data_imports_data_importer_stop (_tmp8_);
+ spit_data_imports_data_importer_stop (_tmp7_);
#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _g_object_unref0 (_tmp8_);
+ _g_object_unref0 (_tmp7_);
#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_welcome_data_imports_host_clean_up (self);
#line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_free0 (msg);
-#line 2333 "DataImportsPluginHost.c"
+#line 2318 "DataImportsPluginHost.c"
}
@@ -2347,7 +2332,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane));
-#line 2343 "DataImportsPluginHost.c"
+#line 2328 "DataImportsPluginHost.c"
}
@@ -2357,21 +2342,21 @@ static void spit_data_imports_welcome_data_imports_host_real_install_static_mess
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (message != NULL);
-#line 2353 "DataImportsPluginHost.c"
+#line 2338 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
SpitDataImportsWelcomeDataImportsHost * self;
- SpitDataImportsDataImporter* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- SpitDataImportsService* _tmp2_ = NULL;
- SpitDataImportsService* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- SpitDataImportsImportableLibrary** _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
+ SpitDataImportsDataImporter* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
+ SpitDataImportsService* _tmp2_;
+ SpitDataImportsService* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ SpitDataImportsImportableLibrary** _tmp7_;
+ gint _tmp7__length1;
#line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2404,17 +2389,17 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel
_tmp7__length1 = discovered_libraries_length1;
#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp7__length1 > 0) {
-#line 2400 "DataImportsPluginHost.c"
- SpitDataImportsWelcomeImportMetaHost* _tmp8_ = NULL;
- SpitDataImportsDataImporter* _tmp9_ = NULL;
- SpitDataImportsDataImporter* _tmp10_ = NULL;
- SpitDataImportsService* _tmp11_ = NULL;
- SpitDataImportsService* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- SpitDataImportsImportableLibrary** _tmp14_ = NULL;
- gint _tmp14__length1 = 0;
- SpitDataImportsWelcomeImportServiceEntry* _tmp15_ = NULL;
- SpitDataImportsWelcomeImportServiceEntry* _tmp16_ = NULL;
+#line 2385 "DataImportsPluginHost.c"
+ SpitDataImportsWelcomeImportMetaHost* _tmp8_;
+ SpitDataImportsDataImporter* _tmp9_;
+ SpitDataImportsDataImporter* _tmp10_;
+ SpitDataImportsService* _tmp11_;
+ SpitDataImportsService* _tmp12_;
+ const gchar* _tmp13_;
+ SpitDataImportsImportableLibrary** _tmp14_;
+ gint _tmp14__length1;
+ SpitDataImportsWelcomeImportServiceEntry* _tmp15_;
+ SpitDataImportsWelcomeImportServiceEntry* _tmp16_;
#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp8_ = self->priv->meta_host;
#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2443,7 +2428,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel
_g_object_unref0 (_tmp12_);
#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_tmp10_);
-#line 2439 "DataImportsPluginHost.c"
+#line 2424 "DataImportsPluginHost.c"
}
}
@@ -2454,7 +2439,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_import_prog
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (message != NULL);
-#line 2450 "DataImportsPluginHost.c"
+#line 2435 "DataImportsPluginHost.c"
}
@@ -2462,18 +2447,18 @@ static void spit_data_imports_welcome_data_imports_host_real_update_import_progr
SpitDataImportsWelcomeDataImportsHost * self;
#line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
-#line 2458 "DataImportsPluginHost.c"
+#line 2443 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
SpitDataImportsWelcomeDataImportsHost * self;
- SpitDataImportsCoreImporter* _tmp0_ = NULL;
- SpitDataImportsImportableMediaItem** _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- gdouble _tmp2_ = 0.0;
- gdouble _tmp3_ = 0.0;
- const gchar* _tmp4_ = NULL;
+ SpitDataImportsCoreImporter* _tmp0_;
+ SpitDataImportsImportableMediaItem** _tmp1_;
+ gint _tmp1__length1;
+ gdouble _tmp2_;
+ gdouble _tmp3_;
+ const gchar* _tmp4_;
#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2490,18 +2475,18 @@ static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items
_tmp4_ = progress_message;
#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_);
-#line 2486 "DataImportsPluginHost.c"
+#line 2471 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) {
SpitDataImportsWelcomeDataImportsHost * self;
- SpitDataImportsCoreImporter* _tmp0_ = NULL;
- SpitDataImportsImportedItemsCountCallback _tmp1_ = NULL;
- void* _tmp1__target = NULL;
- SpitDataImportsCoreImporter* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- SpitDataImportsWelcomeImportMetaHost* _tmp4_ = NULL;
+ SpitDataImportsCoreImporter* _tmp0_;
+ SpitDataImportsImportedItemsCountCallback _tmp1_;
+ void* _tmp1__target;
+ SpitDataImportsCoreImporter* _tmp2_;
+ gint _tmp3_;
+ SpitDataImportsWelcomeImportMetaHost* _tmp4_;
#line 354 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2522,7 +2507,7 @@ static void spit_data_imports_welcome_data_imports_host_real_finalize_import (Sp
_tmp4_ = self->priv->meta_host;
#line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_welcome_import_meta_host_finalize_import (_tmp4_, self);
-#line 2518 "DataImportsPluginHost.c"
+#line 2503 "DataImportsPluginHost.c"
}
@@ -2533,7 +2518,7 @@ static void spit_data_imports_welcome_data_imports_host_class_init (SpitDataImpo
g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeDataImportsHostPrivate));
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_data_imports_host_finalize;
-#line 2529 "DataImportsPluginHost.c"
+#line 2514 "DataImportsPluginHost.c"
}
@@ -2541,30 +2526,30 @@ static void spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface);
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->get_data_importer = (SpitDataImportsDataImporter* (*)(SpitDataImportsPluginHost*)) spit_data_imports_welcome_data_imports_host_real_get_data_importer;
+ iface->get_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsPluginHost *)) spit_data_imports_welcome_data_imports_host_real_get_data_importer;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->start_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_welcome_data_imports_host_real_start_importing;
+ iface->start_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_welcome_data_imports_host_real_start_importing;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->stop_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_welcome_data_imports_host_real_stop_importing;
+ iface->stop_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_welcome_data_imports_host_real_stop_importing;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->post_error = (void (*)(SpitDataImportsPluginHost*, GError*)) spit_data_imports_welcome_data_imports_host_real_post_error;
+ iface->post_error = (void (*) (SpitDataImportsPluginHost *, GError*)) spit_data_imports_welcome_data_imports_host_real_post_error;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->post_error_message = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_post_error_message;
+ iface->post_error_message = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_welcome_data_imports_host_real_post_error_message;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->install_dialog_pane = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_dialog_pane;
+ iface->install_dialog_pane = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_dialog_pane;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->install_static_message_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_static_message_pane;
+ iface->install_static_message_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_static_message_pane;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->install_library_selection_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane;
+ iface->install_library_selection_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->install_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane;
+ iface->install_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->update_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane;
+ iface->update_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->prepare_media_items_for_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import;
+ iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->finalize_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_finalize_import;
-#line 2560 "DataImportsPluginHost.c"
+ iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_finalize_import;
+#line 2545 "DataImportsPluginHost.c"
}
@@ -2575,11 +2560,11 @@ static void spit_data_imports_welcome_data_imports_host_instance_init (SpitDataI
self->priv->active_importer = NULL;
#line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self->priv->importing_halted = FALSE;
-#line 2571 "DataImportsPluginHost.c"
+#line 2556 "DataImportsPluginHost.c"
}
-static void spit_data_imports_welcome_data_imports_host_finalize (GObject* obj) {
+static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj) {
SpitDataImportsWelcomeDataImportsHost * self;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
@@ -2589,7 +2574,7 @@ static void spit_data_imports_welcome_data_imports_host_finalize (GObject* obj)
_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
G_OBJECT_CLASS (spit_data_imports_welcome_data_imports_host_parent_class)->finalize (obj);
-#line 2585 "DataImportsPluginHost.c"
+#line 2570 "DataImportsPluginHost.c"
}
@@ -2614,30 +2599,30 @@ static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImpo
result = g_new0 (SpitDataImportsImportableLibrary*, length + 1);
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
for (i = 0; i < length; i++) {
-#line 2610 "DataImportsPluginHost.c"
- SpitDataImportsImportableLibrary* _tmp0_ = NULL;
+#line 2595 "DataImportsPluginHost.c"
+ SpitDataImportsImportableLibrary* _tmp0_;
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
result[i] = _tmp0_;
-#line 2616 "DataImportsPluginHost.c"
+#line 2601 "DataImportsPluginHost.c"
}
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 2620 "DataImportsPluginHost.c"
+#line 2605 "DataImportsPluginHost.c"
}
SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) {
SpitDataImportsWelcomeImportServiceEntry * self = NULL;
- SpitDataImportsPluginHost* _tmp0_ = NULL;
- SpitDataImportsPluginHost* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- SpitDataImportsImportableLibrary** _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
- SpitDataImportsImportableLibrary** _tmp5_ = NULL;
- gint _tmp5__length1 = 0;
+ SpitDataImportsPluginHost* _tmp0_;
+ SpitDataImportsPluginHost* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ SpitDataImportsImportableLibrary** _tmp4_;
+ gint _tmp4__length1;
+ SpitDataImportsImportableLibrary** _tmp5_;
+ gint _tmp5__length1;
#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2678,22 +2663,22 @@ SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_servi
self->priv->_discovered_libraries_size_ = self->priv->discovered_libraries_length1;
#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return self;
-#line 2674 "DataImportsPluginHost.c"
+#line 2659 "DataImportsPluginHost.c"
}
SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) {
#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return spit_data_imports_welcome_import_service_entry_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, host, pluggable_name, discovered_libraries, discovered_libraries_length1);
-#line 2681 "DataImportsPluginHost.c"
+#line 2666 "DataImportsPluginHost.c"
}
static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base) {
SpitDataImportsWelcomeImportServiceEntry * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry);
#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2704,21 +2689,21 @@ static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_na
result = _tmp1_;
#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 2700 "DataImportsPluginHost.c"
+#line 2685 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base) {
SpitDataImportsWelcomeImportServiceEntry * self;
- SpitDataImportsImportableLibrary** _tmp0_ = NULL;
- gint _tmp0__length1 = 0;
+ SpitDataImportsImportableLibrary** _tmp0_;
+ gint _tmp0__length1;
#line 385 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry);
#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = self->priv->discovered_libraries;
#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0__length1 = self->priv->discovered_libraries_length1;
-#line 2714 "DataImportsPluginHost.c"
+#line 2699 "DataImportsPluginHost.c"
{
SpitDataImportsImportableLibrary** library_collection = NULL;
gint library_collection_length1 = 0;
@@ -2730,19 +2715,19 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
library_collection_length1 = _tmp0__length1;
#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
for (library_it = 0; library_it < _tmp0__length1; library_it = library_it + 1) {
-#line 2726 "DataImportsPluginHost.c"
- SpitDataImportsImportableLibrary* _tmp1_ = NULL;
+#line 2711 "DataImportsPluginHost.c"
+ SpitDataImportsImportableLibrary* _tmp1_;
SpitDataImportsImportableLibrary* library = NULL;
#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp1_ = _g_object_ref0 (library_collection[library_it]);
#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
library = _tmp1_;
-#line 2733 "DataImportsPluginHost.c"
+#line 2718 "DataImportsPluginHost.c"
{
- SpitDataImportsPluginHost* _tmp2_ = NULL;
- SpitDataImportsDataImporter* _tmp3_ = NULL;
- SpitDataImportsDataImporter* _tmp4_ = NULL;
- SpitDataImportsImportableLibrary* _tmp5_ = NULL;
+ SpitDataImportsPluginHost* _tmp2_;
+ SpitDataImportsDataImporter* _tmp3_;
+ SpitDataImportsDataImporter* _tmp4_;
+ SpitDataImportsImportableLibrary* _tmp5_;
#line 387 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp2_ = self->priv->host;
#line 387 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2757,7 +2742,7 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
_g_object_unref0 (_tmp4_);
#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (library);
-#line 2753 "DataImportsPluginHost.c"
+#line 2738 "DataImportsPluginHost.c"
}
}
}
@@ -2771,7 +2756,7 @@ static void spit_data_imports_welcome_import_service_entry_class_init (SpitDataI
g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportServiceEntryPrivate));
#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_service_entry_finalize;
-#line 2767 "DataImportsPluginHost.c"
+#line 2752 "DataImportsPluginHost.c"
}
@@ -2779,21 +2764,21 @@ static void spit_data_imports_welcome_import_service_entry_welcome_service_entry
#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->get_service_name = (gchar* (*)(WelcomeServiceEntry*)) spit_data_imports_welcome_import_service_entry_real_get_service_name;
+ iface->get_service_name = (gchar* (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_get_service_name;
#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- iface->execute = (void (*)(WelcomeServiceEntry*)) spit_data_imports_welcome_import_service_entry_real_execute;
-#line 2778 "DataImportsPluginHost.c"
+ iface->execute = (void (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_execute;
+#line 2763 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_import_service_entry_instance_init (SpitDataImportsWelcomeImportServiceEntry * self) {
#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE (self);
-#line 2785 "DataImportsPluginHost.c"
+#line 2770 "DataImportsPluginHost.c"
}
-static void spit_data_imports_welcome_import_service_entry_finalize (GObject* obj) {
+static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj) {
SpitDataImportsWelcomeImportServiceEntry * self;
#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry);
@@ -2805,7 +2790,7 @@ static void spit_data_imports_welcome_import_service_entry_finalize (GObject* ob
_g_object_unref0 (self->priv->host);
#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
G_OBJECT_CLASS (spit_data_imports_welcome_import_service_entry_parent_class)->finalize (obj);
-#line 2801 "DataImportsPluginHost.c"
+#line 2786 "DataImportsPluginHost.c"
}
@@ -2825,8 +2810,8 @@ GType spit_data_imports_welcome_import_service_entry_get_type (void) {
SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog) {
SpitDataImportsWelcomeImportMetaHost * self = NULL;
- WelcomeDialog* _tmp0_ = NULL;
- WelcomeDialog* _tmp1_ = NULL;
+ WelcomeDialog* _tmp0_;
+ WelcomeDialog* _tmp1_;
#line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_val_if_fail (IS_WELCOME_DIALOG (dialog), NULL);
#line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2841,25 +2826,25 @@ SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host
self->priv->dialog = _tmp1_;
#line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return self;
-#line 2837 "DataImportsPluginHost.c"
+#line 2822 "DataImportsPluginHost.c"
}
SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog) {
#line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return spit_data_imports_welcome_import_meta_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, dialog);
-#line 2844 "DataImportsPluginHost.c"
+#line 2829 "DataImportsPluginHost.c"
}
void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self) {
SpitDataImportsService** services = NULL;
- gint _tmp0_ = 0;
- SpitDataImportsService** _tmp1_ = NULL;
- gint services_length1 = 0;
- gint _services_size_ = 0;
- SpitDataImportsService** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
+ gint _tmp0_;
+ SpitDataImportsService** _tmp1_;
+ gint services_length1;
+ gint _services_size_;
+ SpitDataImportsService** _tmp2_;
+ gint _tmp2__length1;
#line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self));
#line 400 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2874,7 +2859,7 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
_tmp2_ = services;
#line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp2__length1 = services_length1;
-#line 2870 "DataImportsPluginHost.c"
+#line 2855 "DataImportsPluginHost.c"
{
SpitDataImportsService** service_collection = NULL;
gint service_collection_length1 = 0;
@@ -2886,19 +2871,19 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
service_collection_length1 = _tmp2__length1;
#line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
for (service_it = 0; service_it < _tmp2__length1; service_it = service_it + 1) {
-#line 2882 "DataImportsPluginHost.c"
- SpitDataImportsService* _tmp3_ = NULL;
+#line 2867 "DataImportsPluginHost.c"
+ SpitDataImportsService* _tmp3_;
SpitDataImportsService* service = NULL;
#line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp3_ = _g_object_ref0 (service_collection[service_it]);
#line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
service = _tmp3_;
-#line 2889 "DataImportsPluginHost.c"
+#line 2874 "DataImportsPluginHost.c"
{
SpitDataImportsWelcomeDataImportsHost* host = NULL;
- SpitDataImportsService* _tmp4_ = NULL;
- SpitDataImportsWelcomeDataImportsHost* _tmp5_ = NULL;
- SpitDataImportsWelcomeDataImportsHost* _tmp6_ = NULL;
+ SpitDataImportsService* _tmp4_;
+ SpitDataImportsWelcomeDataImportsHost* _tmp5_;
+ SpitDataImportsWelcomeDataImportsHost* _tmp6_;
#line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp4_ = service;
#line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2913,18 +2898,18 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
_g_object_unref0 (host);
#line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (service);
-#line 2909 "DataImportsPluginHost.c"
+#line 2894 "DataImportsPluginHost.c"
}
}
}
#line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2915 "DataImportsPluginHost.c"
+#line 2900 "DataImportsPluginHost.c"
}
void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host) {
- SpitDataImportsWelcomeDataImportsHost* _tmp0_ = NULL;
+ SpitDataImportsWelcomeDataImportsHost* _tmp0_;
#line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self));
#line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2933,18 +2918,18 @@ void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImports
_tmp0_ = host;
#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 2929 "DataImportsPluginHost.c"
+#line 2914 "DataImportsPluginHost.c"
}
void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self, WelcomeServiceEntry* entry) {
- WelcomeServiceEntry* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- WelcomeDialog* _tmp5_ = NULL;
- WelcomeServiceEntry* _tmp6_ = NULL;
+ WelcomeServiceEntry* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ WelcomeDialog* _tmp5_;
+ WelcomeServiceEntry* _tmp6_;
#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self));
#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2971,7 +2956,7 @@ void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataI
_tmp6_ = entry;
#line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
welcome_dialog_install_service_entry (_tmp5_, _tmp6_);
-#line 2967 "DataImportsPluginHost.c"
+#line 2952 "DataImportsPluginHost.c"
}
@@ -2982,18 +2967,18 @@ static void spit_data_imports_welcome_import_meta_host_class_init (SpitDataImpor
g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportMetaHostPrivate));
#line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_meta_host_finalize;
-#line 2978 "DataImportsPluginHost.c"
+#line 2963 "DataImportsPluginHost.c"
}
static void spit_data_imports_welcome_import_meta_host_instance_init (SpitDataImportsWelcomeImportMetaHost * self) {
#line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE (self);
-#line 2985 "DataImportsPluginHost.c"
+#line 2970 "DataImportsPluginHost.c"
}
-static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj) {
+static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj) {
SpitDataImportsWelcomeImportMetaHost * self;
#line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHost);
@@ -3001,7 +2986,7 @@ static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj) {
_g_object_unref0 (self->priv->dialog);
#line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
G_OBJECT_CLASS (spit_data_imports_welcome_import_meta_host_parent_class)->finalize (obj);
-#line 2997 "DataImportsPluginHost.c"
+#line 2982 "DataImportsPluginHost.c"
}
@@ -3019,10 +3004,10 @@ GType spit_data_imports_welcome_import_meta_host_get_type (void) {
SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1) {
SpitDataImportsService** result = NULL;
- gint _tmp0_ = 0;
- SpitDataImportsService** _tmp1_ = NULL;
- SpitDataImportsService** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
+ gint _tmp0_;
+ SpitDataImportsService** _tmp1_;
+ SpitDataImportsService** _tmp2_;
+ gint _tmp2__length1;
#line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp1_ = spit_data_imports_load_services (TRUE, &_tmp0_);
#line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3033,40 +3018,40 @@ SpitDataImportsService** spit_data_imports_load_all_services (int* result_length
if (result_length1) {
#line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
*result_length1 = _tmp2__length1;
-#line 3029 "DataImportsPluginHost.c"
+#line 3014 "DataImportsPluginHost.c"
}
#line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
result = _tmp2_;
#line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 3035 "DataImportsPluginHost.c"
+#line 3020 "DataImportsPluginHost.c"
}
-static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value) {
+static void _vala_array_add69 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value) {
#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if ((*length) == (*size)) {
#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
*array = g_renew (SpitDataImportsService*, *array, (*size) + 1);
-#line 3046 "DataImportsPluginHost.c"
+#line 3031 "DataImportsPluginHost.c"
}
#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
(*array)[(*length)++] = value;
#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
(*array)[*length] = NULL;
-#line 3052 "DataImportsPluginHost.c"
+#line 3037 "DataImportsPluginHost.c"
}
-static gint __lambda22_ (void* a, void* b) {
+static gint __lambda23_ (void* a, void* b) {
gint result = 0;
- void* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- void* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gint _tmp4_ = 0;
+ void* _tmp0_;
+ const gchar* _tmp1_;
+ void* _tmp2_;
+ const gchar* _tmp3_;
+ gint _tmp4_;
#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = a;
#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3081,37 +3066,37 @@ static gint __lambda22_ (void* a, void* b) {
result = _tmp4_;
#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 3077 "DataImportsPluginHost.c"
+#line 3062 "DataImportsPluginHost.c"
}
-static gint ___lambda22____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda23____compar_fn_t (void* key1, void* key2) {
gint result;
- result = __lambda22_ (key1, key2);
+ result = __lambda23_ (key1, key2);
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 3086 "DataImportsPluginHost.c"
+#line 3071 "DataImportsPluginHost.c"
}
SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1) {
SpitDataImportsService** result = NULL;
SpitDataImportsService** loaded_services = NULL;
- SpitDataImportsService** _tmp0_ = NULL;
- gint loaded_services_length1 = 0;
- gint _loaded_services_size_ = 0;
+ SpitDataImportsService** _tmp0_;
+ gint loaded_services_length1;
+ gint _loaded_services_size_;
GeeCollection* pluggables = NULL;
- gboolean _tmp1_ = FALSE;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
- SpitDataImportsService** _tmp26_ = NULL;
- gint _tmp26__length1 = 0;
- SpitDataImportsService** _tmp27_ = NULL;
- gint _tmp27__length1 = 0;
- SpitDataImportsService** _tmp28_ = NULL;
- gint _tmp28__length1 = 0;
+ gboolean _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
+ SpitDataImportsService** _tmp26_;
+ gint _tmp26__length1;
+ SpitDataImportsService** _tmp27_;
+ gint _tmp27__length1;
+ SpitDataImportsService** _tmp28_;
+ gint _tmp28__length1;
#line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = g_new0 (SpitDataImportsService*, 0 + 1);
#line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3135,11 +3120,11 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
#line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_debug ("DataImportsPluginHost.vala:429: DataImportsDialog: discovered %d plugg" \
"able data import services.", _tmp5_);
-#line 3130 "DataImportsPluginHost.c"
+#line 3115 "DataImportsPluginHost.c"
{
GeeIterator* _pluggable_it = NULL;
- GeeCollection* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ GeeCollection* _tmp6_;
+ GeeIterator* _tmp7_;
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp6_ = pluggables;
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3148,25 +3133,25 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
_pluggable_it = _tmp7_;
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
while (TRUE) {
-#line 3143 "DataImportsPluginHost.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 3128 "DataImportsPluginHost.c"
+ GeeIterator* _tmp8_;
+ gboolean _tmp9_;
SpitPluggable* pluggable = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
gint pluggable_interface = 0;
- SpitPluggable* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
+ SpitPluggable* _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
SpitDataImportsService* service = NULL;
- SpitPluggable* _tmp19_ = NULL;
- SpitDataImportsService* _tmp20_ = NULL;
- SpitDataImportsService* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- SpitDataImportsService** _tmp23_ = NULL;
- gint _tmp23__length1 = 0;
- SpitDataImportsService* _tmp24_ = NULL;
- SpitDataImportsService* _tmp25_ = NULL;
+ SpitPluggable* _tmp19_;
+ SpitDataImportsService* _tmp20_;
+ SpitDataImportsService* _tmp21_;
+ const gchar* _tmp22_;
+ SpitDataImportsService** _tmp23_;
+ gint _tmp23__length1;
+ SpitDataImportsService* _tmp24_;
+ SpitDataImportsService* _tmp25_;
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp8_ = _pluggable_it;
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3175,7 +3160,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
if (!_tmp9_) {
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
break;
-#line 3170 "DataImportsPluginHost.c"
+#line 3155 "DataImportsPluginHost.c"
}
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp10_ = _pluggable_it;
@@ -3193,11 +3178,11 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
_tmp14_ = pluggable_interface;
#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp14_ != SPIT_DATA_IMPORTS_CURRENT_INTERFACE) {
-#line 3188 "DataImportsPluginHost.c"
- SpitPluggable* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gint _tmp18_ = 0;
+#line 3173 "DataImportsPluginHost.c"
+ SpitPluggable* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
+ gint _tmp18_;
#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp15_ = pluggable;
#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3215,7 +3200,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
_g_object_unref0 (pluggable);
#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
continue;
-#line 3209 "DataImportsPluginHost.c"
+#line 3194 "DataImportsPluginHost.c"
}
#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp19_ = pluggable;
@@ -3244,11 +3229,11 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
_g_object_unref0 (service);
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (pluggable);
-#line 3237 "DataImportsPluginHost.c"
+#line 3222 "DataImportsPluginHost.c"
}
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_pluggable_it);
-#line 3241 "DataImportsPluginHost.c"
+#line 3226 "DataImportsPluginHost.c"
}
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp26_ = loaded_services;
@@ -3259,7 +3244,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp27__length1 = loaded_services_length1;
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda22____compar_fn_t);
+ qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda23____compar_fn_t);
#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp28_ = loaded_services;
#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3268,7 +3253,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
if (result_length1) {
#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
*result_length1 = _tmp28__length1;
-#line 3261 "DataImportsPluginHost.c"
+#line 3246 "DataImportsPluginHost.c"
}
#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
result = _tmp28_;
@@ -3276,15 +3261,15 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
_g_object_unref0 (pluggables);
#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 3269 "DataImportsPluginHost.c"
+#line 3254 "DataImportsPluginHost.c"
}
void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll) {
- ImportManifest* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+ ImportManifest* _tmp0_;
+ GeeList* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
#line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
#line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3299,31 +3284,31 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
_tmp3_ = _tmp2_;
#line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp3_ > 0) {
-#line 3292 "DataImportsPluginHost.c"
- ImportManifest* _tmp4_ = NULL;
+#line 3277 "DataImportsPluginHost.c"
+ ImportManifest* _tmp4_;
#line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp4_ = spit_data_imports_meta_manifest;
#line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp4_ == NULL) {
-#line 3298 "DataImportsPluginHost.c"
- ImportManifest* _tmp5_ = NULL;
+#line 3283 "DataImportsPluginHost.c"
+ ImportManifest* _tmp5_;
#line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp5_ = import_manifest_new (NULL, NULL);
#line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_import_manifest_unref0 (spit_data_imports_meta_manifest);
#line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_meta_manifest = _tmp5_;
-#line 3306 "DataImportsPluginHost.c"
+#line 3291 "DataImportsPluginHost.c"
}
{
GeeList* _result_list = NULL;
- ImportManifest* _tmp6_ = NULL;
- GeeList* _tmp7_ = NULL;
- GeeList* _tmp8_ = NULL;
+ ImportManifest* _tmp6_;
+ GeeList* _tmp7_;
+ GeeList* _tmp8_;
gint _result_size = 0;
- GeeList* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+ GeeList* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
gint _result_index = 0;
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp6_ = manifest;
@@ -3345,16 +3330,16 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
_result_index = -1;
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
while (TRUE) {
-#line 3338 "DataImportsPluginHost.c"
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
+#line 3323 "DataImportsPluginHost.c"
+ gint _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
BatchImportResult* _result_ = NULL;
- GeeList* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- gpointer _tmp17_ = NULL;
- ImportManifest* _tmp18_ = NULL;
- BatchImportResult* _tmp19_ = NULL;
+ GeeList* _tmp15_;
+ gint _tmp16_;
+ gpointer _tmp17_;
+ ImportManifest* _tmp18_;
+ BatchImportResult* _tmp19_;
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp12_ = _result_index;
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3367,7 +3352,7 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
if (!(_tmp13_ < _tmp14_)) {
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
break;
-#line 3360 "DataImportsPluginHost.c"
+#line 3345 "DataImportsPluginHost.c"
}
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp15_ = _result_list;
@@ -3385,14 +3370,14 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
import_manifest_add_result (_tmp18_, _tmp19_);
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_batch_import_result_unref0 (_result_);
-#line 3378 "DataImportsPluginHost.c"
+#line 3363 "DataImportsPluginHost.c"
}
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_result_list);
-#line 3382 "DataImportsPluginHost.c"
+#line 3367 "DataImportsPluginHost.c"
}
} else {
- ImportManifest* _tmp20_ = NULL;
+ ImportManifest* _tmp20_;
#line 470 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
data_imports_ui_data_imports_dialog_terminate_instance ();
#line 471 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3403,17 +3388,17 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
_import_manifest_unref0 (spit_data_imports_meta_manifest);
#line 472 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_meta_manifest = NULL;
-#line 3396 "DataImportsPluginHost.c"
+#line 3381 "DataImportsPluginHost.c"
}
}
gint64 spit_data_imports_import_job_comparator (void* a, void* b) {
gint64 result = 0LL;
- void* _tmp0_ = NULL;
- time_t _tmp1_ = 0;
- void* _tmp2_ = NULL;
- time_t _tmp3_ = 0;
+ void* _tmp0_;
+ time_t _tmp1_;
+ void* _tmp2_;
+ time_t _tmp3_;
#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = a;
#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3426,7 +3411,7 @@ gint64 spit_data_imports_import_job_comparator (void* a, void* b) {
result = (gint64) (_tmp1_ - _tmp3_);
#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 3419 "DataImportsPluginHost.c"
+#line 3404 "DataImportsPluginHost.c"
}
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index c5428ba..28039a9 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -1,4 +1,4 @@
-/* DataImportsUI.c generated by valac 0.34.7, the Vala compiler
+/* DataImportsUI.c generated by valac 0.36.6, the Vala compiler
* generated from DataImportsUI.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -209,7 +209,7 @@ struct _DataImportsUIDataImportsDialogPrivate {
static gpointer data_imports_ui_concrete_dialog_pane_parent_class = NULL;
-static SpitDataImportsDialogPaneIface* data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_parent_iface = NULL;
+static SpitDataImportsDialogPaneIface * data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_parent_iface = NULL;
static gpointer data_imports_ui_static_message_pane_parent_class = NULL;
static gpointer data_imports_ui_library_selection_pane_parent_class = NULL;
static gpointer data_imports_ui_progress_pane_parent_class = NULL;
@@ -233,7 +233,7 @@ static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitData
static SpitDataImportsDialogPaneGeometryOptions data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitDataImportsDialogPane* base);
static void data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDataImportsDialogPane* base);
static void data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitDataImportsDialogPane* base);
-static void data_imports_ui_concrete_dialog_pane_finalize (GObject* obj);
+static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj);
GType data_imports_ui_static_message_pane_get_type (void) G_GNUC_CONST;
enum {
DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_DUMMY_PROPERTY
@@ -253,17 +253,17 @@ static void data_imports_ui_library_selection_pane_on_file_selected (DataImports
static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right);
static Block11Data* block11_data_ref (Block11Data* _data11_);
static void block11_data_unref (void * _userdata_);
-static void ___lambda20_ (Block11Data* _data11_);
+static void ___lambda21_ (Block11Data* _data11_);
static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self);
-static void ____lambda20__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
-static void __lambda21_ (DataImportsUILibrarySelectionPane* self);
+static void ____lambda21__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
+static void __lambda22_ (DataImportsUILibrarySelectionPane* self);
static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library);
-static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void ___lambda22__gtk_button_clicked (GtkButton* _sender, gpointer self);
static Block12Data* block12_data_ref (Block12Data* _data12_);
static void block12_data_unref (void * _userdata_);
-static void __lambda19_ (Block12Data* _data12_);
-static void ___lambda19__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-static void data_imports_ui_library_selection_pane_finalize (GObject* obj);
+static void __lambda20_ (Block12Data* _data12_);
+static void ___lambda20__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void data_imports_ui_library_selection_pane_finalize (GObject * obj);
GType data_imports_ui_progress_pane_get_type (void) G_GNUC_CONST;
#define DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPanePrivate))
enum {
@@ -273,7 +273,7 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* messa
DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message);
void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message);
void spin_event_loop (void);
-static void data_imports_ui_progress_pane_finalize (GObject* obj);
+static void data_imports_ui_progress_pane_finalize (GObject * obj);
GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
GType spit_data_imports_concrete_data_imports_host_get_type (void) G_GNUC_CONST;
@@ -322,14 +322,14 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (
void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self);
void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self);
void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self);
-static void data_imports_ui_data_imports_dialog_finalize (GObject* obj);
+static void data_imports_ui_data_imports_dialog_finalize (GObject * 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);
DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct (GType object_type) {
DataImportsUIConcreteDialogPane * self = NULL;
- GtkBox* _tmp0_ = NULL;
+ GtkBox* _tmp0_;
#line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = (DataImportsUIConcreteDialogPane*) g_object_new (object_type, NULL);
#line 16 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -363,8 +363,8 @@ static gpointer _g_object_ref0 (gpointer self) {
static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitDataImportsDialogPane* base) {
DataImportsUIConcreteDialogPane * self;
GtkWidget* result = NULL;
- GtkBox* _tmp0_ = NULL;
- GtkWidget* _tmp1_ = NULL;
+ GtkBox* _tmp0_;
+ GtkWidget* _tmp1_;
#line 19 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane);
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -423,13 +423,13 @@ static void data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_i
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- iface->get_widget = (GtkWidget* (*)(SpitDataImportsDialogPane*)) data_imports_ui_concrete_dialog_pane_real_get_widget;
+ iface->get_widget = (GtkWidget* (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_get_widget;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- iface->get_preferred_geometry = (SpitDataImportsDialogPaneGeometryOptions (*)(SpitDataImportsDialogPane*)) data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry;
+ iface->get_preferred_geometry = (SpitDataImportsDialogPaneGeometryOptions (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- iface->on_pane_installed = (void (*)(SpitDataImportsDialogPane*)) data_imports_ui_concrete_dialog_pane_real_on_pane_installed;
+ iface->on_pane_installed = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_installed;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- iface->on_pane_uninstalled = (void (*)(SpitDataImportsDialogPane*)) data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled;
+ iface->on_pane_uninstalled = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled;
#line 430 "DataImportsUI.c"
}
@@ -441,7 +441,7 @@ static void data_imports_ui_concrete_dialog_pane_instance_init (DataImportsUICon
}
-static void data_imports_ui_concrete_dialog_pane_finalize (GObject* obj) {
+static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj) {
DataImportsUIConcreteDialogPane * self;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane);
@@ -470,11 +470,11 @@ GType data_imports_ui_concrete_dialog_pane_get_type (void) {
DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (GType object_type, const gchar* message_string) {
DataImportsUIStaticMessagePane * self = NULL;
GtkLabel* message_label = NULL;
- const gchar* _tmp0_ = NULL;
- GtkLabel* _tmp1_ = NULL;
- GtkWidget* _tmp2_ = NULL;
- GtkBox* _tmp3_ = NULL;
- GtkBox* _tmp4_ = NULL;
+ const gchar* _tmp0_;
+ GtkLabel* _tmp1_;
+ GtkWidget* _tmp2_;
+ GtkBox* _tmp3_;
+ GtkBox* _tmp4_;
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (message_string != NULL, NULL);
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -521,11 +521,11 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new (const g
DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, const gchar* msg) {
DataImportsUIStaticMessagePane * self = NULL;
GtkLabel* label = NULL;
- GtkLabel* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- GtkWidget* _tmp2_ = NULL;
- GtkBox* _tmp3_ = NULL;
- GtkBox* _tmp4_ = NULL;
+ GtkLabel* _tmp0_;
+ const gchar* _tmp1_;
+ GtkWidget* _tmp2_;
+ GtkBox* _tmp3_;
+ GtkBox* _tmp4_;
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (msg != NULL, NULL);
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -625,11 +625,11 @@ static void block11_data_unref (void * _userdata_) {
}
-static void ___lambda20_ (Block11Data* _data11_) {
+static void ___lambda21_ (Block11Data* _data11_) {
DataImportsUILibrarySelectionPane* self;
- GtkFileChooserButton* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- GtkRadioButton* _tmp2_ = NULL;
+ GtkFileChooserButton* _tmp0_;
+ GFile* _tmp1_;
+ GtkRadioButton* _tmp2_;
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = _data11_->self;
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -645,7 +645,7 @@ static void ___lambda20_ (Block11Data* _data11_) {
#line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp2_ != NULL) {
#line 644 "DataImportsUI.c"
- GtkRadioButton* _tmp3_ = NULL;
+ GtkRadioButton* _tmp3_;
#line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = self->priv->file_radio;
#line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -658,34 +658,34 @@ static void ___lambda20_ (Block11Data* _data11_) {
}
-static void ____lambda20__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
+static void ____lambda21__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- ___lambda20_ (self);
+ ___lambda21_ (self);
#line 661 "DataImportsUI.c"
}
-static void __lambda21_ (DataImportsUILibrarySelectionPane* self) {
- SpitDataImportsImportableLibrary* _tmp0_ = NULL;
+static void __lambda22_ (DataImportsUILibrarySelectionPane* self) {
+ SpitDataImportsImportableLibrary* _tmp0_;
#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->selected_library;
#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
#line 671 "DataImportsUI.c"
- SpitDataImportsImportableLibrary* _tmp1_ = NULL;
+ SpitDataImportsImportableLibrary* _tmp1_;
#line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = self->priv->selected_library;
#line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_library_selection_pane_on_library_selected (self, _tmp1_);
#line 677 "DataImportsUI.c"
} else {
- GFile* _tmp2_ = NULL;
+ GFile* _tmp2_;
#line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = self->priv->selected_file;
#line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp2_ != NULL) {
#line 684 "DataImportsUI.c"
- GFile* _tmp3_ = NULL;
+ GFile* _tmp3_;
#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = self->priv->selected_file;
#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -701,9 +701,9 @@ static void __lambda21_ (DataImportsUILibrarySelectionPane* self) {
}
-static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void ___lambda22__gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- __lambda21_ ((DataImportsUILibrarySelectionPane*) self);
+ __lambda22_ ((DataImportsUILibrarySelectionPane*) self);
#line 703 "DataImportsUI.c"
}
@@ -711,42 +711,41 @@ static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self)
DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
DataImportsUILibrarySelectionPane * self = NULL;
gboolean _tmp0_ = FALSE;
- SpitDataImportsImportableLibrary** _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- SpitDataImportsPluginHost* _tmp2_ = NULL;
+ SpitDataImportsImportableLibrary** _tmp1_;
+ gint _tmp1__length1;
+ SpitDataImportsPluginHost* _tmp2_;
GtkBox* content_box = NULL;
- GtkBox* _tmp3_ = NULL;
- GtkBox* _tmp4_ = NULL;
- GtkBox* _tmp5_ = NULL;
+ GtkBox* _tmp3_;
+ GtkBox* _tmp4_;
+ GtkBox* _tmp5_;
GtkLabel* welcome_label = NULL;
- GtkLabel* _tmp6_ = NULL;
- GtkLabel* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- GtkLabel* _tmp9_ = NULL;
- GtkLabel* _tmp10_ = NULL;
- GtkBox* _tmp11_ = NULL;
- GtkLabel* _tmp12_ = NULL;
+ GtkLabel* _tmp6_;
+ GtkLabel* _tmp7_;
+ const gchar* _tmp8_;
+ GtkLabel* _tmp9_;
+ GtkLabel* _tmp10_;
+ GtkBox* _tmp11_;
+ GtkLabel* _tmp12_;
gint radio_margin_left = 0;
gint radio_margin_right = 0;
gint chooser_margin_left = 0;
- gint _tmp13_ = 0;
+ gint _tmp13_;
gint chooser_margin_right = 0;
- gint _tmp14_ = 0;
+ gint _tmp14_;
GtkRadioButton* lib_radio = NULL;
- SpitDataImportsImportableLibrary** _tmp15_ = NULL;
- gint _tmp15__length1 = 0;
- const gchar* _tmp37_ = NULL;
- const gchar* _tmp47_ = NULL;
- GtkButton* _tmp48_ = NULL;
- GtkButton* _tmp49_ = NULL;
+ SpitDataImportsImportableLibrary** _tmp15_;
+ gint _tmp15__length1;
+ const gchar* _tmp37_;
+ GtkButton* _tmp46_;
+ GtkButton* _tmp47_;
GtkButtonBox* button_box = NULL;
- GtkButtonBox* _tmp50_ = NULL;
- GtkButton* _tmp51_ = NULL;
- GtkBox* _tmp52_ = NULL;
- GtkWidget* _tmp53_ = NULL;
- GtkBox* _tmp54_ = NULL;
- GtkBox* _tmp55_ = NULL;
- GtkBox* _tmp56_ = NULL;
+ GtkButtonBox* _tmp48_;
+ GtkButton* _tmp49_;
+ GtkBox* _tmp50_;
+ GtkWidget* _tmp51_;
+ GtkBox* _tmp52_;
+ GtkBox* _tmp53_;
+ GtkBox* _tmp54_;
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -761,11 +760,11 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
if (_tmp1__length1 > 0) {
#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = TRUE;
-#line 760 "DataImportsUI.c"
+#line 759 "DataImportsUI.c"
} else {
#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = data_imports_ui_library_selection_pane_on_file_selected != NULL;
-#line 764 "DataImportsUI.c"
+#line 763 "DataImportsUI.c"
}
#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_vala_assert (_tmp0_, "discovered_libraries.length > 0 || on_file_selected != null");
@@ -833,11 +832,11 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
_tmp15__length1 = discovered_libraries_length1;
#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp15__length1 > 0) {
-#line 832 "DataImportsUI.c"
- gint _tmp16_ = 0;
- SpitDataImportsImportableLibrary** _tmp17_ = NULL;
- gint _tmp17__length1 = 0;
- const gchar* _tmp28_ = NULL;
+#line 831 "DataImportsUI.c"
+ gint _tmp16_;
+ SpitDataImportsImportableLibrary** _tmp17_;
+ gint _tmp17__length1;
+ const gchar* _tmp28_;
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp16_ = radio_margin_left;
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -846,7 +845,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
_tmp17_ = discovered_libraries;
#line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp17__length1 = discovered_libraries_length1;
-#line 845 "DataImportsUI.c"
+#line 844 "DataImportsUI.c"
{
SpitDataImportsImportableLibrary** library_collection = NULL;
gint library_collection_length1 = 0;
@@ -858,25 +857,25 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
library_collection_length1 = _tmp17__length1;
#line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
for (library_it = 0; library_it < _tmp17__length1; library_it = library_it + 1) {
-#line 857 "DataImportsUI.c"
- SpitDataImportsImportableLibrary* _tmp18_ = NULL;
+#line 856 "DataImportsUI.c"
+ SpitDataImportsImportableLibrary* _tmp18_;
SpitDataImportsImportableLibrary* library = NULL;
#line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp18_ = _g_object_ref0 (library_collection[library_it]);
#line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
library = _tmp18_;
-#line 864 "DataImportsUI.c"
+#line 863 "DataImportsUI.c"
{
gchar* lib_radio_label = NULL;
- SpitDataImportsImportableLibrary* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- GtkBox* _tmp21_ = NULL;
- GtkRadioButton* _tmp22_ = NULL;
- SpitDataImportsImportableLibrary* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- gint _tmp26_ = 0;
- GtkRadioButton* _tmp27_ = NULL;
+ SpitDataImportsImportableLibrary* _tmp19_;
+ gchar* _tmp20_;
+ GtkBox* _tmp21_;
+ GtkRadioButton* _tmp22_;
+ SpitDataImportsImportableLibrary* _tmp23_;
+ const gchar* _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ GtkRadioButton* _tmp27_;
#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp19_ = library;
#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -905,7 +904,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
_g_free0 (lib_radio_label);
#line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (library);
-#line 904 "DataImportsUI.c"
+#line 903 "DataImportsUI.c"
}
}
}
@@ -913,15 +912,15 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
_tmp28_ = file_select_label;
#line 91 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp28_ != NULL) {
-#line 912 "DataImportsUI.c"
- GtkBox* _tmp29_ = NULL;
- GtkRadioButton* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- gint _tmp32_ = 0;
- gint _tmp33_ = 0;
- GtkRadioButton* _tmp34_ = NULL;
- GtkRadioButton* _tmp35_ = NULL;
- GtkRadioButton* _tmp36_ = NULL;
+#line 911 "DataImportsUI.c"
+ GtkBox* _tmp29_;
+ GtkRadioButton* _tmp30_;
+ const gchar* _tmp31_;
+ gint _tmp32_;
+ gint _tmp33_;
+ GtkRadioButton* _tmp34_;
+ GtkRadioButton* _tmp35_;
+ GtkRadioButton* _tmp36_;
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp29_ = content_box;
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -946,24 +945,23 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
_g_object_unref0 (self->priv->file_radio);
#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->file_radio = _tmp36_;
-#line 945 "DataImportsUI.c"
+#line 944 "DataImportsUI.c"
}
}
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp37_ = file_select_label;
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp37_ != NULL) {
-#line 952 "DataImportsUI.c"
+#line 951 "DataImportsUI.c"
Block11Data* _data11_;
- const gchar* _tmp38_ = NULL;
- GtkFileChooserButton* _tmp39_ = NULL;
- GtkFileChooserButton* _tmp40_ = NULL;
- GtkFileChooserButton* _tmp41_ = NULL;
- gint _tmp42_ = 0;
- GtkFileChooserButton* _tmp43_ = NULL;
- gint _tmp44_ = 0;
- GtkBox* _tmp45_ = NULL;
- GtkFileChooserButton* _tmp46_ = NULL;
+ GtkFileChooserButton* _tmp38_;
+ GtkFileChooserButton* _tmp39_;
+ GtkFileChooserButton* _tmp40_;
+ gint _tmp41_;
+ GtkFileChooserButton* _tmp42_;
+ gint _tmp43_;
+ GtkBox* _tmp44_;
+ GtkFileChooserButton* _tmp45_;
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_data11_ = g_slice_new0 (Block11Data);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -971,89 +969,85 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_data11_->self = g_object_ref (self);
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp38_ = _ ("Database file:");
+ _tmp38_ = (GtkFileChooserButton*) gtk_file_chooser_button_new (_ ("Database file:"), GTK_FILE_CHOOSER_ACTION_OPEN);
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp39_ = (GtkFileChooserButton*) gtk_file_chooser_button_new (_tmp38_, GTK_FILE_CHOOSER_ACTION_OPEN);
+ g_object_ref_sink (_tmp38_);
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp39_);
-#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data11_->file_chooser = _tmp39_;
+ _data11_->file_chooser = _tmp38_;
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp40_ = _data11_->file_chooser;
+ _tmp39_ = _data11_->file_chooser;
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda20__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
+ g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda21__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp41_ = _data11_->file_chooser;
+ _tmp40_ = _data11_->file_chooser;
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp42_ = chooser_margin_left;
+ _tmp41_ = chooser_margin_left;
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp42_);
+ gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp41_);
#line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp43_ = _data11_->file_chooser;
+ _tmp42_ = _data11_->file_chooser;
#line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp44_ = chooser_margin_right;
+ _tmp43_ = chooser_margin_right;
#line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp44_);
+ gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp43_);
#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp45_ = content_box;
+ _tmp44_ = content_box;
#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp46_ = _data11_->file_chooser;
+ _tmp45_ = _data11_->file_chooser;
#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_box_pack_start (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
+ gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
block11_data_unref (_data11_);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_data11_ = NULL;
-#line 1003 "DataImportsUI.c"
+#line 999 "DataImportsUI.c"
}
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp47_ = _ ("_Import");
+ _tmp46_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Import"));
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp48_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp47_);
-#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp48_);
+ g_object_ref_sink (_tmp46_);
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->import_button);
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self->priv->import_button = _tmp48_;
+ self->priv->import_button = _tmp46_;
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp49_ = self->priv->import_button;
+ _tmp47_ = self->priv->import_button;
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_object (_tmp49_, "clicked", (GCallback) ___lambda21__gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp47_, "clicked", (GCallback) ___lambda22__gtk_button_clicked, self, 0);
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp50_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ _tmp48_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp50_);
+ g_object_ref_sink (_tmp48_);
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- button_box = _tmp50_;
+ button_box = _tmp48_;
#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_object_set (button_box, "layout-style", GTK_BUTTONBOX_CENTER, NULL);
#line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp51_ = self->priv->import_button;
+ _tmp49_ = self->priv->import_button;
#line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
#line 124 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp52_ = content_box;
+ _tmp50_ = content_box;
#line 124 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_box_pack_end (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 6);
+ gtk_box_pack_end (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 6);
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp53_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+ _tmp51_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp54_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp53_, gtk_box_get_type ()) ? ((GtkBox*) _tmp53_) : NULL;
+ _tmp52_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, gtk_box_get_type ()) ? ((GtkBox*) _tmp51_) : NULL;
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp54_ == NULL) {
+ if (_tmp52_ == NULL) {
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_tmp53_);
-#line 1043 "DataImportsUI.c"
+ _g_object_unref0 (_tmp51_);
+#line 1037 "DataImportsUI.c"
}
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp55_ = _tmp54_;
+ _tmp53_ = _tmp52_;
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp56_ = content_box;
+ _tmp54_ = content_box;
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_box_pack_start (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_tmp55_);
+ _g_object_unref0 (_tmp53_);
#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1066,14 +1060,14 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
_g_object_unref0 (content_box);
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return self;
-#line 1065 "DataImportsUI.c"
+#line 1059 "DataImportsUI.c"
}
DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return data_imports_ui_library_selection_pane_construct (DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, host, welcome_message, discovered_libraries, discovered_libraries_length1, file_select_label);
-#line 1072 "DataImportsUI.c"
+#line 1066 "DataImportsUI.c"
}
@@ -1082,7 +1076,7 @@ static Block12Data* block12_data_ref (Block12Data* _data12_) {
g_atomic_int_inc (&_data12_->_ref_count_);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return _data12_;
-#line 1081 "DataImportsUI.c"
+#line 1075 "DataImportsUI.c"
}
@@ -1091,7 +1085,7 @@ static void block12_data_unref (void * _userdata_) {
_data12_ = (Block12Data*) _userdata_;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) {
-#line 1090 "DataImportsUI.c"
+#line 1084 "DataImportsUI.c"
DataImportsUILibrarySelectionPane* self;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = _data12_->self;
@@ -1103,16 +1097,16 @@ static void block12_data_unref (void * _userdata_) {
_g_object_unref0 (self);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_slice_free (Block12Data, _data12_);
-#line 1102 "DataImportsUI.c"
+#line 1096 "DataImportsUI.c"
}
}
-static void __lambda19_ (Block12Data* _data12_) {
+static void __lambda20_ (Block12Data* _data12_) {
DataImportsUILibrarySelectionPane* self;
- GtkRadioButton* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
+ GtkRadioButton* _tmp0_;
+ gboolean _tmp1_;
+ gboolean _tmp2_;
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = _data12_->self;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1123,9 +1117,9 @@ static void __lambda19_ (Block12Data* _data12_) {
_tmp2_ = _tmp1_;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp2_) {
-#line 1122 "DataImportsUI.c"
- SpitDataImportsImportableLibrary* _tmp3_ = NULL;
- SpitDataImportsImportableLibrary* _tmp4_ = NULL;
+#line 1116 "DataImportsUI.c"
+ SpitDataImportsImportableLibrary* _tmp3_;
+ SpitDataImportsImportableLibrary* _tmp4_;
#line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = _data12_->library;
#line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1136,36 +1130,36 @@ static void __lambda19_ (Block12Data* _data12_) {
self->priv->selected_library = _tmp4_;
#line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
-#line 1135 "DataImportsUI.c"
+#line 1129 "DataImportsUI.c"
}
}
-static void ___lambda19__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void ___lambda20__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- __lambda19_ (self);
-#line 1143 "DataImportsUI.c"
+ __lambda20_ (self);
+#line 1137 "DataImportsUI.c"
}
static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right) {
GtkRadioButton* result = NULL;
Block12Data* _data12_;
- SpitDataImportsImportableLibrary* _tmp0_ = NULL;
- SpitDataImportsImportableLibrary* _tmp1_ = NULL;
- GtkRadioButton* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- GtkRadioButton* _tmp4_ = NULL;
- GtkRadioButton* _tmp5_ = NULL;
- GtkRadioButton* _tmp9_ = NULL;
- GtkRadioButton* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- GtkRadioButton* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- GtkBox* _tmp14_ = NULL;
- GtkRadioButton* _tmp15_ = NULL;
- GtkRadioButton* _tmp16_ = NULL;
- GtkRadioButton* _tmp17_ = NULL;
+ SpitDataImportsImportableLibrary* _tmp0_;
+ SpitDataImportsImportableLibrary* _tmp1_;
+ GtkRadioButton* _tmp2_;
+ const gchar* _tmp3_;
+ GtkRadioButton* _tmp4_;
+ GtkRadioButton* _tmp5_;
+ GtkRadioButton* _tmp9_;
+ GtkRadioButton* _tmp10_;
+ gint _tmp11_;
+ GtkRadioButton* _tmp12_;
+ gint _tmp13_;
+ GtkBox* _tmp14_;
+ GtkRadioButton* _tmp15_;
+ GtkRadioButton* _tmp16_;
+ GtkRadioButton* _tmp17_;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self), NULL);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1204,10 +1198,10 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
_tmp5_ = group;
#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp5_ == NULL) {
-#line 1203 "DataImportsUI.c"
- GtkRadioButton* _tmp6_ = NULL;
- SpitDataImportsImportableLibrary* _tmp7_ = NULL;
- SpitDataImportsImportableLibrary* _tmp8_ = NULL;
+#line 1197 "DataImportsUI.c"
+ GtkRadioButton* _tmp6_;
+ SpitDataImportsImportableLibrary* _tmp7_;
+ SpitDataImportsImportableLibrary* _tmp8_;
#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp6_ = _data12_->button;
#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1220,12 +1214,12 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
_g_object_unref0 (self->priv->selected_library);
#line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->selected_library = _tmp8_;
-#line 1219 "DataImportsUI.c"
+#line 1213 "DataImportsUI.c"
}
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp9_ = _data12_->button;
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda19__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0);
+ g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda20__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0);
#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp10_ = _data12_->button;
#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1256,14 +1250,14 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
_data12_ = NULL;
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 1255 "DataImportsUI.c"
+#line 1249 "DataImportsUI.c"
}
static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self) {
gboolean _tmp0_ = FALSE;
- SpitDataImportsImportableLibrary* _tmp1_ = NULL;
- GtkButton* _tmp3_ = NULL;
+ SpitDataImportsImportableLibrary* _tmp1_;
+ GtkButton* _tmp3_;
#line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self));
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1272,28 +1266,28 @@ static void data_imports_ui_library_selection_pane_set_import_button_sensitivity
if (_tmp1_ != NULL) {
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = TRUE;
-#line 1271 "DataImportsUI.c"
+#line 1265 "DataImportsUI.c"
} else {
- GFile* _tmp2_ = NULL;
+ GFile* _tmp2_;
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = self->priv->selected_file;
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = _tmp2_ != NULL;
-#line 1278 "DataImportsUI.c"
+#line 1272 "DataImportsUI.c"
}
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = self->priv->import_button;
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 1284 "DataImportsUI.c"
+#line 1278 "DataImportsUI.c"
}
static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library) {
- SpitDataImportsPluginHost* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- SpitDataImportsDataImporter* _tmp2_ = NULL;
- SpitDataImportsImportableLibrary* _tmp3_ = NULL;
+ SpitDataImportsPluginHost* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
+ SpitDataImportsDataImporter* _tmp2_;
+ SpitDataImportsImportableLibrary* _tmp3_;
#line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self));
#line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1310,15 +1304,15 @@ static void data_imports_ui_library_selection_pane_on_library_selected (DataImpo
spit_data_imports_data_importer_on_library_selected (_tmp2_, _tmp3_);
#line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp2_);
-#line 1309 "DataImportsUI.c"
+#line 1303 "DataImportsUI.c"
}
static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, GFile* file) {
- SpitDataImportsPluginHost* _tmp0_ = NULL;
- SpitDataImportsDataImporter* _tmp1_ = NULL;
- SpitDataImportsDataImporter* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
+ SpitDataImportsPluginHost* _tmp0_;
+ SpitDataImportsDataImporter* _tmp1_;
+ SpitDataImportsDataImporter* _tmp2_;
+ GFile* _tmp3_;
#line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self));
#line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1335,7 +1329,7 @@ static void data_imports_ui_library_selection_pane_on_file_selected (DataImports
spit_data_imports_data_importer_on_file_selected (_tmp2_, _tmp3_);
#line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp2_);
-#line 1334 "DataImportsUI.c"
+#line 1328 "DataImportsUI.c"
}
@@ -1346,7 +1340,7 @@ static void data_imports_ui_library_selection_pane_class_init (DataImportsUILibr
g_type_class_add_private (klass, sizeof (DataImportsUILibrarySelectionPanePrivate));
#line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (klass)->finalize = data_imports_ui_library_selection_pane_finalize;
-#line 1345 "DataImportsUI.c"
+#line 1339 "DataImportsUI.c"
}
@@ -1359,11 +1353,11 @@ static void data_imports_ui_library_selection_pane_instance_init (DataImportsUIL
self->priv->selected_file = NULL;
#line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->file_radio = NULL;
-#line 1358 "DataImportsUI.c"
+#line 1352 "DataImportsUI.c"
}
-static void data_imports_ui_library_selection_pane_finalize (GObject* obj) {
+static void data_imports_ui_library_selection_pane_finalize (GObject * obj) {
DataImportsUILibrarySelectionPane * self;
#line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, DataImportsUILibrarySelectionPane);
@@ -1377,7 +1371,7 @@ static void data_imports_ui_library_selection_pane_finalize (GObject* obj) {
_g_object_unref0 (self->priv->file_radio);
#line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (data_imports_ui_library_selection_pane_parent_class)->finalize (obj);
-#line 1376 "DataImportsUI.c"
+#line 1370 "DataImportsUI.c"
}
@@ -1396,17 +1390,17 @@ GType data_imports_ui_library_selection_pane_get_type (void) {
DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message) {
DataImportsUIProgressPane * self = NULL;
GtkBox* content_box = NULL;
- GtkBox* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- GtkLabel* _tmp2_ = NULL;
- GtkLabel* _tmp3_ = NULL;
- GtkProgressBar* _tmp4_ = NULL;
- GtkProgressBar* _tmp5_ = NULL;
- GtkLabel* _tmp6_ = NULL;
- GtkLabel* _tmp7_ = NULL;
- GtkWidget* _tmp8_ = NULL;
- GtkContainer* _tmp9_ = NULL;
- GtkContainer* _tmp10_ = NULL;
+ GtkBox* _tmp0_;
+ const gchar* _tmp1_;
+ GtkLabel* _tmp2_;
+ GtkLabel* _tmp3_;
+ GtkProgressBar* _tmp4_;
+ GtkProgressBar* _tmp5_;
+ GtkLabel* _tmp6_;
+ GtkLabel* _tmp7_;
+ GtkWidget* _tmp8_;
+ GtkContainer* _tmp9_;
+ GtkContainer* _tmp10_;
#line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (message != NULL, NULL);
#line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1463,7 +1457,7 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object
if (_tmp9_ == NULL) {
#line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp8_);
-#line 1462 "DataImportsUI.c"
+#line 1456 "DataImportsUI.c"
}
#line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp10_ = _tmp9_;
@@ -1475,21 +1469,21 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object
_g_object_unref0 (content_box);
#line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return self;
-#line 1474 "DataImportsUI.c"
+#line 1468 "DataImportsUI.c"
}
DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* message) {
#line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return data_imports_ui_progress_pane_construct (DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, message);
-#line 1481 "DataImportsUI.c"
+#line 1475 "DataImportsUI.c"
}
void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message) {
- GtkProgressBar* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
- const gchar* _tmp2_ = NULL;
+ GtkProgressBar* _tmp0_;
+ gdouble _tmp1_;
+ const gchar* _tmp2_;
#line 183 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_PROGRESS_PANE (self));
#line 184 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1502,20 +1496,20 @@ void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* s
_tmp2_ = progress_message;
#line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp2_ != NULL) {
-#line 1501 "DataImportsUI.c"
- GtkLabel* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
+#line 1495 "DataImportsUI.c"
+ GtkLabel* _tmp3_;
+ const gchar* _tmp4_;
#line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = self->priv->progress_label;
#line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4_ = progress_message;
#line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_label_set_label (_tmp3_, _tmp4_);
-#line 1510 "DataImportsUI.c"
+#line 1504 "DataImportsUI.c"
}
#line 187 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spin_event_loop ();
-#line 1514 "DataImportsUI.c"
+#line 1508 "DataImportsUI.c"
}
@@ -1526,18 +1520,18 @@ static void data_imports_ui_progress_pane_class_init (DataImportsUIProgressPaneC
g_type_class_add_private (klass, sizeof (DataImportsUIProgressPanePrivate));
#line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (klass)->finalize = data_imports_ui_progress_pane_finalize;
-#line 1525 "DataImportsUI.c"
+#line 1519 "DataImportsUI.c"
}
static void data_imports_ui_progress_pane_instance_init (DataImportsUIProgressPane * self) {
#line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv = DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE (self);
-#line 1532 "DataImportsUI.c"
+#line 1526 "DataImportsUI.c"
}
-static void data_imports_ui_progress_pane_finalize (GObject* obj) {
+static void data_imports_ui_progress_pane_finalize (GObject * obj) {
DataImportsUIProgressPane * self;
#line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPane);
@@ -1549,7 +1543,7 @@ static void data_imports_ui_progress_pane_finalize (GObject* obj) {
_g_object_unref0 (self->priv->progress_bar);
#line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (data_imports_ui_progress_pane_parent_class)->finalize (obj);
-#line 1548 "DataImportsUI.c"
+#line 1542 "DataImportsUI.c"
}
@@ -1570,52 +1564,50 @@ static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_
result = data_imports_ui_data_imports_dialog_on_window_close ((DataImportsUIDataImportsDialog*) self, event);
#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 1569 "DataImportsUI.c"
+#line 1563 "DataImportsUI.c"
}
static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
#line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_on_service_changed ((DataImportsUIDataImportsDialog*) self);
-#line 1576 "DataImportsUI.c"
+#line 1570 "DataImportsUI.c"
}
static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_on_close_cancel_clicked ((DataImportsUIDataImportsDialog*) self);
-#line 1583 "DataImportsUI.c"
+#line 1577 "DataImportsUI.c"
}
DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type) {
DataImportsUIDataImportsDialog * self = NULL;
gboolean use_header = FALSE;
- GtkSettings* _tmp0_ = NULL;
+ GtkSettings* _tmp0_;
gint _tmp1_ = 0;
- gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp2_;
+ gboolean _tmp3_;
gchar* title = NULL;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ gchar* _tmp5_;
gchar* label = NULL;
- const gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
+ gchar* _tmp6_;
+ const gchar* _tmp7_;
SpitDataImportsService** loaded_services = NULL;
- gint _tmp10_ = 0;
- SpitDataImportsService** _tmp11_ = NULL;
- gint loaded_services_length1 = 0;
- gint _loaded_services_size_ = 0;
- SpitDataImportsService** _tmp12_ = NULL;
- gint _tmp12__length1 = 0;
- GtkBox* _tmp67_ = NULL;
- GtkBox* _tmp68_ = NULL;
- GtkBox* _tmp69_ = NULL;
- gboolean _tmp70_ = FALSE;
- GtkButton* _tmp81_ = NULL;
- SpitDataImportsService** _tmp82_ = NULL;
- gint _tmp82__length1 = 0;
+ gint _tmp8_;
+ SpitDataImportsService** _tmp9_;
+ gint loaded_services_length1;
+ gint _loaded_services_size_;
+ SpitDataImportsService** _tmp10_;
+ gint _tmp10__length1;
+ GtkBox* _tmp65_;
+ GtkBox* _tmp66_;
+ GtkBox* _tmp67_;
+ gboolean _tmp68_;
+ GtkButton* _tmp78_;
+ SpitDataImportsService** _tmp79_;
+ gint _tmp79__length1;
#line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
use_header = FALSE;
#line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1628,11 +1620,11 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
if (_tmp2_) {
#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = 1;
-#line 1627 "DataImportsUI.c"
+#line 1619 "DataImportsUI.c"
} else {
#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = 0;
-#line 1631 "DataImportsUI.c"
+#line 1623 "DataImportsUI.c"
}
#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = (DataImportsUIDataImportsDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
@@ -1640,352 +1632,348 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
_tmp3_ = use_header;
#line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp3_) {
-#line 1639 "DataImportsUI.c"
- GtkWidget* _tmp4_ = NULL;
+#line 1631 "DataImportsUI.c"
+ GtkWidget* _tmp4_;
#line 215 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 215 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1645 "DataImportsUI.c"
+#line 1637 "DataImportsUI.c"
}
#line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event, self, 0);
#line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp5_ = _ ("Import From Application");
+ _tmp5_ = g_strdup (_ ("Import From Application"));
#line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp6_ = g_strdup (_tmp5_);
-#line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- title = _tmp6_;
-#line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp7_ = _ ("Import media _from:");
+ title = _tmp5_;
#line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp6_ = g_strdup (_ ("Import media _from:"));
#line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- label = _tmp8_;
+ label = _tmp6_;
#line 223 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp9_ = title;
+ _tmp7_ = title;
#line 223 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp9_);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp7_);
#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp11_ = spit_data_imports_load_services (FALSE, &_tmp10_);
+ _tmp9_ = spit_data_imports_load_services (FALSE, &_tmp8_);
#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- loaded_services = _tmp11_;
+ loaded_services = _tmp9_;
#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- loaded_services_length1 = _tmp10_;
+ loaded_services_length1 = _tmp8_;
#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_loaded_services_size_ = loaded_services_length1;
#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp12_ = loaded_services;
+ _tmp10_ = loaded_services;
#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp12__length1 = loaded_services_length1;
+ _tmp10__length1 = loaded_services_length1;
#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp12__length1 > 0) {
-#line 1681 "DataImportsUI.c"
- GtkComboBoxText* _tmp13_ = NULL;
- GtkComboBoxText* _tmp14_ = NULL;
+ if (_tmp10__length1 > 0) {
+#line 1669 "DataImportsUI.c"
+ GtkComboBoxText* _tmp11_;
+ GtkComboBoxText* _tmp12_;
gchar* last_used_service = NULL;
- ConfigFacade* _tmp15_ = NULL;
- ConfigFacade* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
+ ConfigFacade* _tmp13_;
+ ConfigFacade* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
gint ticker = 0;
gint last_used_index = 0;
- SpitDataImportsService** _tmp19_ = NULL;
- gint _tmp19__length1 = 0;
- gint _tmp33_ = 0;
- GtkComboBoxText* _tmp37_ = NULL;
- gboolean _tmp38_ = FALSE;
+ SpitDataImportsService** _tmp17_;
+ gint _tmp17__length1;
+ gint _tmp31_;
+ GtkComboBoxText* _tmp35_;
+ gboolean _tmp36_;
#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp13_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+ _tmp11_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp13_);
+ g_object_ref_sink (_tmp11_);
#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->service_selector_box);
#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self->priv->service_selector_box = _tmp13_;
+ self->priv->service_selector_box = _tmp11_;
#line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp14_ = self->priv->service_selector_box;
+ _tmp12_ = self->priv->service_selector_box;
#line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox), 0);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), 0);
#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp15_ = config_facade_get_instance ();
+ _tmp13_ = config_facade_get_instance ();
#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp16_ = _tmp15_;
+ _tmp14_ = _tmp13_;
#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp17_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp15_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp18_ = _tmp17_;
+ _tmp16_ = _tmp15_;
#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_tmp16_);
+ _g_object_unref0 (_tmp14_);
#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- last_used_service = _tmp18_;
+ last_used_service = _tmp16_;
#line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
ticker = 0;
#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
last_used_index = -1;
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp19_ = loaded_services;
+ _tmp17_ = loaded_services;
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp19__length1 = loaded_services_length1;
-#line 1728 "DataImportsUI.c"
+ _tmp17__length1 = loaded_services_length1;
+#line 1716 "DataImportsUI.c"
{
SpitDataImportsService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_collection = _tmp19_;
+ service_collection = _tmp17_;
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_collection_length1 = _tmp19__length1;
+ service_collection_length1 = _tmp17__length1;
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- for (service_it = 0; service_it < _tmp19__length1; service_it = service_it + 1) {
-#line 1740 "DataImportsUI.c"
- SpitDataImportsService* _tmp20_ = NULL;
+ for (service_it = 0; service_it < _tmp17__length1; service_it = service_it + 1) {
+#line 1728 "DataImportsUI.c"
+ SpitDataImportsService* _tmp18_;
SpitDataImportsService* service = NULL;
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp20_ = _g_object_ref0 (service_collection[service_it]);
+ _tmp18_ = _g_object_ref0 (service_collection[service_it]);
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service = _tmp20_;
-#line 1747 "DataImportsUI.c"
+ service = _tmp18_;
+#line 1735 "DataImportsUI.c"
{
gchar* curr_service_id = NULL;
- SpitDataImportsService* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
- const gchar* _tmp25_ = NULL;
- GtkComboBoxText* _tmp29_ = NULL;
- SpitDataImportsService* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- gint _tmp32_ = 0;
+ SpitDataImportsService* _tmp19_;
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
+ gboolean _tmp22_ = FALSE;
+ const gchar* _tmp23_;
+ GtkComboBoxText* _tmp27_;
+ SpitDataImportsService* _tmp28_;
+ const gchar* _tmp29_;
+ gint _tmp30_;
#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp21_ = service;
+ _tmp19_ = service;
#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp22_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp20_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp23_ = g_strdup (_tmp22_);
+ _tmp21_ = g_strdup (_tmp20_);
#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- curr_service_id = _tmp23_;
+ curr_service_id = _tmp21_;
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp25_ = last_used_service;
+ _tmp23_ = last_used_service;
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp25_ != NULL) {
-#line 1771 "DataImportsUI.c"
- const gchar* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
+ if (_tmp23_ != NULL) {
+#line 1759 "DataImportsUI.c"
+ const gchar* _tmp24_;
+ const gchar* _tmp25_;
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp26_ = last_used_service;
+ _tmp24_ = last_used_service;
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp27_ = curr_service_id;
+ _tmp25_ = curr_service_id;
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp24_ = g_strcmp0 (_tmp26_, _tmp27_) == 0;
-#line 1780 "DataImportsUI.c"
+ _tmp22_ = g_strcmp0 (_tmp24_, _tmp25_) == 0;
+#line 1768 "DataImportsUI.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp24_ = FALSE;
-#line 1784 "DataImportsUI.c"
+ _tmp22_ = FALSE;
+#line 1772 "DataImportsUI.c"
}
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp24_) {
-#line 1788 "DataImportsUI.c"
- gint _tmp28_ = 0;
+ if (_tmp22_) {
+#line 1776 "DataImportsUI.c"
+ gint _tmp26_;
#line 241 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp28_ = ticker;
+ _tmp26_ = ticker;
#line 241 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- last_used_index = _tmp28_;
-#line 1794 "DataImportsUI.c"
+ last_used_index = _tmp26_;
+#line 1782 "DataImportsUI.c"
}
#line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp29_ = self->priv->service_selector_box;
+ _tmp27_ = self->priv->service_selector_box;
#line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp30_ = service;
+ _tmp28_ = service;
#line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp31_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp29_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_combo_box_text_append_text (_tmp29_, _tmp31_);
+ gtk_combo_box_text_append_text (_tmp27_, _tmp29_);
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp32_ = ticker;
+ _tmp30_ = ticker;
#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- ticker = _tmp32_ + 1;
+ ticker = _tmp30_ + 1;
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_free0 (curr_service_id);
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service);
-#line 1812 "DataImportsUI.c"
+#line 1800 "DataImportsUI.c"
}
}
}
#line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp33_ = last_used_index;
+ _tmp31_ = last_used_index;
#line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp33_ >= 0) {
-#line 1820 "DataImportsUI.c"
- GtkComboBoxText* _tmp34_ = NULL;
- gint _tmp35_ = 0;
+ if (_tmp31_ >= 0) {
+#line 1808 "DataImportsUI.c"
+ GtkComboBoxText* _tmp32_;
+ gint _tmp33_;
#line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp34_ = self->priv->service_selector_box;
+ _tmp32_ = self->priv->service_selector_box;
#line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp35_ = last_used_index;
+ _tmp33_ = last_used_index;
#line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), _tmp35_);
-#line 1829 "DataImportsUI.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox), _tmp33_);
+#line 1817 "DataImportsUI.c"
} else {
- GtkComboBoxText* _tmp36_ = NULL;
+ GtkComboBoxText* _tmp34_;
#line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp36_ = self->priv->service_selector_box;
+ _tmp34_ = self->priv->service_selector_box;
#line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1836 "DataImportsUI.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1824 "DataImportsUI.c"
}
#line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp37_ = self->priv->service_selector_box;
+ _tmp35_ = self->priv->service_selector_box;
#line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp38_ = use_header;
+ _tmp36_ = use_header;
#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (!_tmp38_) {
-#line 1846 "DataImportsUI.c"
+ if (!_tmp36_) {
+#line 1834 "DataImportsUI.c"
GtkLabel* service_selector_box_label = NULL;
- const gchar* _tmp39_ = NULL;
- GtkLabel* _tmp40_ = NULL;
- GtkLabel* _tmp41_ = NULL;
- GtkComboBoxText* _tmp42_ = NULL;
- GtkLabel* _tmp43_ = NULL;
- GtkLabel* _tmp44_ = NULL;
- GtkComboBoxText* _tmp45_ = NULL;
- GtkComboBoxText* _tmp46_ = NULL;
- GtkComboBoxText* _tmp47_ = NULL;
- GtkComboBoxText* _tmp48_ = NULL;
+ const gchar* _tmp37_;
+ GtkLabel* _tmp38_;
+ GtkLabel* _tmp39_;
+ GtkComboBoxText* _tmp40_;
+ GtkLabel* _tmp41_;
+ GtkLabel* _tmp42_;
+ GtkComboBoxText* _tmp43_;
+ GtkComboBoxText* _tmp44_;
+ GtkComboBoxText* _tmp45_;
+ GtkComboBoxText* _tmp46_;
GtkBox* service_selector_layouter = NULL;
- GtkBox* _tmp49_ = NULL;
- GtkBox* _tmp50_ = NULL;
- GtkBox* _tmp51_ = NULL;
- GtkLabel* _tmp52_ = NULL;
- GtkBox* _tmp53_ = NULL;
- GtkComboBoxText* _tmp54_ = NULL;
+ GtkBox* _tmp47_;
+ GtkBox* _tmp48_;
+ GtkBox* _tmp49_;
+ GtkLabel* _tmp50_;
+ GtkBox* _tmp51_;
+ GtkComboBoxText* _tmp52_;
GtkBox* service_area_layouter = NULL;
- GtkBox* _tmp55_ = NULL;
- GtkBox* _tmp56_ = NULL;
- GtkBox* _tmp57_ = NULL;
+ GtkBox* _tmp53_;
+ GtkBox* _tmp54_;
+ GtkBox* _tmp55_;
GtkSeparator* service_central_separator = NULL;
- GtkSeparator* _tmp58_ = NULL;
- GtkBox* _tmp59_ = NULL;
- GtkSeparator* _tmp60_ = NULL;
- GtkBox* _tmp61_ = NULL;
- GtkBox* _tmp62_ = NULL;
- GtkBox* _tmp63_ = NULL;
- GtkBox* _tmp64_ = NULL;
- GtkBox* _tmp65_ = NULL;
- GtkBox* _tmp66_ = NULL;
+ GtkSeparator* _tmp56_;
+ GtkBox* _tmp57_;
+ GtkSeparator* _tmp58_;
+ GtkBox* _tmp59_;
+ GtkBox* _tmp60_;
+ GtkBox* _tmp61_;
+ GtkBox* _tmp62_;
+ GtkBox* _tmp63_;
+ GtkBox* _tmp64_;
#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp39_ = label;
+ _tmp37_ = label;
#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp40_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp39_);
+ _tmp38_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp37_);
#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp40_);
+ g_object_ref_sink (_tmp38_);
#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_selector_box_label = _tmp40_;
+ service_selector_box_label = _tmp38_;
#line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp41_ = service_selector_box_label;
+ _tmp39_ = service_selector_box_label;
#line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp42_ = self->priv->service_selector_box;
+ _tmp40_ = self->priv->service_selector_box;
#line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_label_set_mnemonic_widget (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
+ gtk_label_set_mnemonic_widget (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget));
#line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp43_ = service_selector_box_label;
+ _tmp41_ = service_selector_box_label;
#line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
#line 258 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp44_ = service_selector_box_label;
+ _tmp42_ = service_selector_box_label;
#line 258 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp45_ = self->priv->service_selector_box;
+ _tmp43_ = self->priv->service_selector_box;
#line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
#line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp46_ = self->priv->service_selector_box;
+ _tmp44_ = self->priv->service_selector_box;
#line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp47_ = self->priv->service_selector_box;
+ _tmp45_ = self->priv->service_selector_box;
#line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 267 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp48_ = self->priv->service_selector_box;
+ _tmp46_ = self->priv->service_selector_box;
#line 267 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp49_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+ _tmp47_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
#line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp49_);
+ g_object_ref_sink (_tmp47_);
#line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_selector_layouter = _tmp49_;
+ service_selector_layouter = _tmp47_;
#line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp50_ = service_selector_layouter;
+ _tmp48_ = service_selector_layouter;
#line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_container_get_type (), GtkContainer), (guint) 12);
+ gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_container_get_type (), GtkContainer), (guint) 12);
#line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp51_ = service_selector_layouter;
+ _tmp49_ = service_selector_layouter;
#line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp52_ = service_selector_box_label;
+ _tmp50_ = service_selector_box_label;
#line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget));
#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp53_ = service_selector_layouter;
+ _tmp51_ = service_selector_layouter;
#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp54_ = self->priv->service_selector_box;
+ _tmp52_ = self->priv->service_selector_box;
#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp55_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp53_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp55_);
+ g_object_ref_sink (_tmp53_);
#line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_area_layouter = _tmp55_;
+ service_area_layouter = _tmp53_;
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp56_ = service_area_layouter;
+ _tmp54_ = service_area_layouter;
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp57_ = service_selector_layouter;
+ _tmp55_ = service_selector_layouter;
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_box_pack_start (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp58_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ _tmp56_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
#line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp58_);
+ g_object_ref_sink (_tmp56_);
#line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_central_separator = _tmp58_;
+ service_central_separator = _tmp56_;
#line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp59_ = service_area_layouter;
+ _tmp57_ = service_area_layouter;
#line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp60_ = service_central_separator;
+ _tmp58_ = service_central_separator;
#line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
#line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp61_ = service_area_layouter;
+ _tmp59_ = service_area_layouter;
#line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
#line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp62_ = service_area_layouter;
+ _tmp60_ = service_area_layouter;
#line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
#line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp63_ = service_area_layouter;
+ _tmp61_ = service_area_layouter;
#line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 283 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp64_ = service_area_layouter;
+ _tmp62_ = service_area_layouter;
#line 283 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp65_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp63_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp66_ = service_area_layouter;
+ _tmp64_ = service_area_layouter;
#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service_central_separator);
#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1994,116 +1982,113 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
_g_object_unref0 (service_selector_layouter);
#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service_selector_box_label);
-#line 1993 "DataImportsUI.c"
+#line 1981 "DataImportsUI.c"
}
#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_free0 (last_used_service);
-#line 1997 "DataImportsUI.c"
+#line 1985 "DataImportsUI.c"
}
#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp67_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp65_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp67_);
+ g_object_ref_sink (_tmp65_);
#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->central_area_layouter);
#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self->priv->central_area_layouter = _tmp67_;
+ self->priv->central_area_layouter = _tmp65_;
#line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp68_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp66_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp69_ = self->priv->central_area_layouter;
+ _tmp67_ = self->priv->central_area_layouter;
#line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp70_ = use_header;
+ _tmp68_ = use_header;
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp70_) {
-#line 2017 "DataImportsUI.c"
- GtkButton* _tmp71_ = NULL;
- GtkButton* _tmp72_ = NULL;
- GtkWidget* _tmp73_ = NULL;
- GtkButton* _tmp74_ = NULL;
- GtkComboBoxText* _tmp75_ = NULL;
+ if (_tmp68_) {
+#line 2005 "DataImportsUI.c"
+ GtkButton* _tmp69_;
+ GtkButton* _tmp70_;
+ GtkWidget* _tmp71_;
+ GtkButton* _tmp72_;
+ GtkComboBoxText* _tmp73_;
#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp71_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+ _tmp69_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp71_);
+ g_object_ref_sink (_tmp69_);
#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->close_cancel_button);
#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self->priv->close_cancel_button = _tmp71_;
+ self->priv->close_cancel_button = _tmp69_;
#line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp72_ = self->priv->close_cancel_button;
+ _tmp70_ = self->priv->close_cancel_button;
#line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp73_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp71_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp74_ = self->priv->close_cancel_button;
+ _tmp72_ = self->priv->close_cancel_button;
#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
+ gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget));
#line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp75_ = self->priv->service_selector_box;
+ _tmp73_ = self->priv->service_selector_box;
#line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp75_ != NULL) {
-#line 2045 "DataImportsUI.c"
- GtkWidget* _tmp76_ = NULL;
- GtkComboBoxText* _tmp77_ = NULL;
+ if (_tmp73_ != NULL) {
+#line 2033 "DataImportsUI.c"
+ GtkWidget* _tmp74_;
+ GtkComboBoxText* _tmp75_;
#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp76_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp74_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp77_ = self->priv->service_selector_box;
+ _tmp75_ = self->priv->service_selector_box;
#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget));
-#line 2054 "DataImportsUI.c"
+ gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget));
+#line 2042 "DataImportsUI.c"
}
} else {
- const gchar* _tmp78_ = NULL;
- GtkWidget* _tmp79_ = NULL;
- GtkButton* _tmp80_ = NULL;
+ GtkWidget* _tmp76_;
+ GtkButton* _tmp77_;
#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp78_ = _ ("_Cancel");
-#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp78_, (gint) GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp79_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+ _tmp76_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, gtk_button_get_type ()) ? ((GtkButton*) _tmp79_) : NULL);
+ _tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp76_, gtk_button_get_type ()) ? ((GtkButton*) _tmp76_) : NULL);
#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->close_cancel_button);
#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self->priv->close_cancel_button = _tmp80_;
-#line 2072 "DataImportsUI.c"
+ self->priv->close_cancel_button = _tmp77_;
+#line 2057 "DataImportsUI.c"
}
#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp81_ = self->priv->close_cancel_button;
+ _tmp78_ = self->priv->close_cancel_button;
#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_object (_tmp81_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp78_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp82_ = loaded_services;
+ _tmp79_ = loaded_services;
#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp82__length1 = loaded_services_length1;
+ _tmp79__length1 = loaded_services_length1;
#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp82__length1 > 0) {
+ if (_tmp79__length1 > 0) {
#line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_on_service_changed (self);
-#line 2088 "DataImportsUI.c"
+#line 2073 "DataImportsUI.c"
} else {
- DataImportsUIStaticMessagePane* _tmp83_ = NULL;
- DataImportsUIStaticMessagePane* _tmp84_ = NULL;
+ DataImportsUIStaticMessagePane* _tmp80_;
+ DataImportsUIStaticMessagePane* _tmp81_;
#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp83_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
+ _tmp80_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp84_ = _tmp83_;
+ _tmp81_ = _tmp80_;
#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+ data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_tmp84_);
+ _g_object_unref0 (_tmp81_);
#line 316 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_close_button_mode (self);
-#line 2102 "DataImportsUI.c"
+#line 2087 "DataImportsUI.c"
}
#line 319 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -2115,28 +2100,28 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
_g_free0 (title);
#line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return self;
-#line 2114 "DataImportsUI.c"
+#line 2099 "DataImportsUI.c"
}
DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void) {
#line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return data_imports_ui_data_imports_dialog_construct (DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG);
-#line 2121 "DataImportsUI.c"
+#line 2106 "DataImportsUI.c"
}
DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_create_instance (void) {
DataImportsUIDataImportsDialog* result = NULL;
- DataImportsUIDataImportsDialog* _tmp0_ = NULL;
- DataImportsUIDataImportsDialog* _tmp2_ = NULL;
- DataImportsUIDataImportsDialog* _tmp3_ = NULL;
+ DataImportsUIDataImportsDialog* _tmp0_;
+ DataImportsUIDataImportsDialog* _tmp2_;
+ DataImportsUIDataImportsDialog* _tmp3_;
#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = data_imports_ui_data_imports_dialog_instance;
#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ == NULL) {
-#line 2134 "DataImportsUI.c"
- DataImportsUIDataImportsDialog* _tmp1_ = NULL;
+#line 2119 "DataImportsUI.c"
+ DataImportsUIDataImportsDialog* _tmp1_;
#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = data_imports_ui_data_imports_dialog_new ();
#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2145,7 +2130,7 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_instance = _tmp1_;
-#line 2144 "DataImportsUI.c"
+#line 2129 "DataImportsUI.c"
}
#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = data_imports_ui_data_imports_dialog_instance;
@@ -2155,29 +2140,29 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
result = _tmp3_;
#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 2154 "DataImportsUI.c"
+#line 2139 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_terminate_instance (void) {
- DataImportsUIDataImportsDialog* _tmp0_ = NULL;
+ DataImportsUIDataImportsDialog* _tmp0_;
#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = data_imports_ui_data_imports_dialog_instance;
#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
-#line 2164 "DataImportsUI.c"
- DataImportsUIDataImportsDialog* _tmp1_ = NULL;
+#line 2149 "DataImportsUI.c"
+ DataImportsUIDataImportsDialog* _tmp1_;
#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = data_imports_ui_data_imports_dialog_instance;
#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_terminate (_tmp1_);
-#line 2170 "DataImportsUI.c"
+#line 2155 "DataImportsUI.c"
}
#line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
#line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2176 "DataImportsUI.c"
+#line 2161 "DataImportsUI.c"
}
@@ -2196,30 +2181,30 @@ static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImports
result = TRUE;
#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 2194 "DataImportsUI.c"
+#line 2179 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsUIDataImportsDialog* self) {
gchar* service_name = NULL;
- GtkComboBoxText* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ GtkComboBoxText* _tmp0_;
+ gchar* _tmp1_;
SpitDataImportsService* selected_service = NULL;
SpitDataImportsService** services = NULL;
- gint _tmp2_ = 0;
- SpitDataImportsService** _tmp3_ = NULL;
- gint services_length1 = 0;
- gint _services_size_ = 0;
- SpitDataImportsService** _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
- SpitDataImportsService* _tmp11_ = NULL;
- ConfigFacade* _tmp12_ = NULL;
- ConfigFacade* _tmp13_ = NULL;
- SpitDataImportsService* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- SpitDataImportsService* _tmp16_ = NULL;
- SpitDataImportsConcreteDataImportsHost* _tmp17_ = NULL;
- SpitDataImportsConcreteDataImportsHost* _tmp18_ = NULL;
+ gint _tmp2_;
+ SpitDataImportsService** _tmp3_;
+ gint services_length1;
+ gint _services_size_;
+ SpitDataImportsService** _tmp4_;
+ gint _tmp4__length1;
+ SpitDataImportsService* _tmp11_;
+ ConfigFacade* _tmp12_;
+ ConfigFacade* _tmp13_;
+ SpitDataImportsService* _tmp14_;
+ const gchar* _tmp15_;
+ SpitDataImportsService* _tmp16_;
+ SpitDataImportsConcreteDataImportsHost* _tmp17_;
+ SpitDataImportsConcreteDataImportsHost* _tmp18_;
#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2244,7 +2229,7 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
_tmp4_ = services;
#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4__length1 = services_length1;
-#line 2242 "DataImportsUI.c"
+#line 2227 "DataImportsUI.c"
{
SpitDataImportsService** service_collection = NULL;
gint service_collection_length1 = 0;
@@ -2256,18 +2241,18 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
service_collection_length1 = _tmp4__length1;
#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) {
-#line 2254 "DataImportsUI.c"
- SpitDataImportsService* _tmp5_ = NULL;
+#line 2239 "DataImportsUI.c"
+ SpitDataImportsService* _tmp5_;
SpitDataImportsService* service = NULL;
#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp5_ = _g_object_ref0 (service_collection[service_it]);
#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
service = _tmp5_;
-#line 2261 "DataImportsUI.c"
+#line 2246 "DataImportsUI.c"
{
- SpitDataImportsService* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
+ SpitDataImportsService* _tmp6_;
+ const gchar* _tmp7_;
+ const gchar* _tmp8_;
#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp6_ = service;
#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2276,9 +2261,9 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
_tmp8_ = service_name;
#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2274 "DataImportsUI.c"
- SpitDataImportsService* _tmp9_ = NULL;
- SpitDataImportsService* _tmp10_ = NULL;
+#line 2259 "DataImportsUI.c"
+ SpitDataImportsService* _tmp9_;
+ SpitDataImportsService* _tmp10_;
#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp9_ = service;
#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2291,11 +2276,11 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
_g_object_unref0 (service);
#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
break;
-#line 2289 "DataImportsUI.c"
+#line 2274 "DataImportsUI.c"
}
#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service);
-#line 2293 "DataImportsUI.c"
+#line 2278 "DataImportsUI.c"
}
}
}
@@ -2333,7 +2318,7 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
_g_object_unref0 (selected_service);
#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_free0 (service_name);
-#line 2331 "DataImportsUI.c"
+#line 2316 "DataImportsUI.c"
}
@@ -2345,12 +2330,12 @@ static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImp
" invoked.");
#line 366 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_terminate (self);
-#line 2342 "DataImportsUI.c"
+#line 2327 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) {
- SpitDataImportsConcreteDataImportsHost* _tmp0_ = NULL;
+ SpitDataImportsConcreteDataImportsHost* _tmp0_;
#line 369 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2359,8 +2344,8 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo
_tmp0_ = self->priv->host;
#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
-#line 2356 "DataImportsUI.c"
- SpitDataImportsConcreteDataImportsHost* _tmp1_ = NULL;
+#line 2341 "DataImportsUI.c"
+ SpitDataImportsConcreteDataImportsHost* _tmp1_;
#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = self->priv->host;
#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2369,7 +2354,7 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo
_g_object_unref0 (self->priv->host);
#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->host = NULL;
-#line 2366 "DataImportsUI.c"
+#line 2351 "DataImportsUI.c"
}
#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -2379,12 +2364,12 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo
_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
#line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2376 "DataImportsUI.c"
+#line 2361 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) {
- GtkBox* _tmp0_ = NULL;
+ GtkBox* _tmp0_;
#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2395,12 +2380,12 @@ static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImpor
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2392 "DataImportsUI.c"
+#line 2377 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) {
- GtkBox* _tmp0_ = NULL;
+ GtkBox* _tmp0_;
#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2411,12 +2396,12 @@ static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataIm
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
#line 393 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2408 "DataImportsUI.c"
+#line 2393 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) {
- GtkBox* _tmp0_ = NULL;
+ GtkBox* _tmp0_;
#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 397 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2427,7 +2412,7 @@ static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataIm
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
#line 400 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2424 "DataImportsUI.c"
+#line 2409 "DataImportsUI.c"
}
@@ -2436,7 +2421,7 @@ static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (Da
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2433 "DataImportsUI.c"
+#line 2418 "DataImportsUI.c"
}
@@ -2445,14 +2430,14 @@ static void data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2442 "DataImportsUI.c"
+#line 2427 "DataImportsUI.c"
}
SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (DataImportsUIDataImportsDialog* self) {
SpitDataImportsDialogPane* result = NULL;
- SpitDataImportsDialogPane* _tmp0_ = NULL;
- SpitDataImportsDialogPane* _tmp1_ = NULL;
+ SpitDataImportsDialogPane* _tmp0_;
+ SpitDataImportsDialogPane* _tmp1_;
#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), NULL);
#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2463,83 +2448,77 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (
result = _tmp1_;
#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 2460 "DataImportsUI.c"
+#line 2445 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self) {
- GtkButton* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- GtkButton* _tmp2_ = NULL;
+ GtkButton* _tmp0_;
+ GtkButton* _tmp1_;
#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->close_cancel_button;
#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp1_ = _ ("_Close");
-#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_button_set_label (_tmp0_, _tmp1_);
+ gtk_button_set_label (_tmp0_, _ ("_Close"));
#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp2_ = self->priv->close_cancel_button;
+ _tmp1_ = self->priv->close_cancel_button;
#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2480 "DataImportsUI.c"
+ gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 2462 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) {
- GtkButton* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ GtkButton* _tmp0_;
#line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->close_cancel_button;
#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp1_ = _ ("_Cancel");
-#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_button_set_label (_tmp0_, _tmp1_);
-#line 2495 "DataImportsUI.c"
+ gtk_button_set_label (_tmp0_, _ ("_Cancel"));
+#line 2474 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) {
- GtkComboBoxText* _tmp0_ = NULL;
+ GtkComboBoxText* _tmp0_;
#line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->service_selector_box;
#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2507 "DataImportsUI.c"
+#line 2486 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) {
- GtkComboBoxText* _tmp0_ = NULL;
+ GtkComboBoxText* _tmp0_;
#line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->service_selector_box;
#line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2519 "DataImportsUI.c"
+#line 2498 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, SpitDataImportsDialogPane* pane) {
- SpitDataImportsDialogPane* _tmp0_ = NULL;
- GtkBox* _tmp6_ = NULL;
- SpitDataImportsDialogPane* _tmp7_ = NULL;
- GtkWidget* _tmp8_ = NULL;
- GtkWidget* _tmp9_ = NULL;
+ SpitDataImportsDialogPane* _tmp0_;
+ GtkBox* _tmp6_;
+ SpitDataImportsDialogPane* _tmp7_;
+ GtkWidget* _tmp8_;
+ GtkWidget* _tmp9_;
SpitDataImportsDialogPaneGeometryOptions geometry_options = 0;
- SpitDataImportsDialogPane* _tmp10_ = NULL;
- SpitDataImportsDialogPaneGeometryOptions _tmp11_ = 0;
- SpitDataImportsDialogPaneGeometryOptions _tmp12_ = 0;
- SpitDataImportsDialogPaneGeometryOptions _tmp14_ = 0;
- SpitDataImportsDialogPane* _tmp15_ = NULL;
- SpitDataImportsDialogPane* _tmp16_ = NULL;
- SpitDataImportsDialogPane* _tmp17_ = NULL;
+ SpitDataImportsDialogPane* _tmp10_;
+ SpitDataImportsDialogPaneGeometryOptions _tmp11_;
+ SpitDataImportsDialogPaneGeometryOptions _tmp12_;
+ SpitDataImportsDialogPaneGeometryOptions _tmp14_;
+ SpitDataImportsDialogPane* _tmp15_;
+ SpitDataImportsDialogPane* _tmp16_;
+ SpitDataImportsDialogPane* _tmp17_;
#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2550,12 +2529,12 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
_tmp0_ = self->priv->active_pane;
#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
-#line 2547 "DataImportsUI.c"
- SpitDataImportsDialogPane* _tmp1_ = NULL;
- GtkBox* _tmp2_ = NULL;
- SpitDataImportsDialogPane* _tmp3_ = NULL;
- GtkWidget* _tmp4_ = NULL;
- GtkWidget* _tmp5_ = NULL;
+#line 2526 "DataImportsUI.c"
+ SpitDataImportsDialogPane* _tmp1_;
+ GtkBox* _tmp2_;
+ SpitDataImportsDialogPane* _tmp3_;
+ GtkWidget* _tmp4_;
+ GtkWidget* _tmp5_;
#line 436 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_debug ("DataImportsUI.vala:436: DataImportsDialog: install_pane( ): a pane is " \
"already installed; removing it.");
@@ -2575,7 +2554,7 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp5_);
-#line 2571 "DataImportsUI.c"
+#line 2550 "DataImportsUI.c"
}
#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp6_ = self->priv->central_area_layouter;
@@ -2603,20 +2582,20 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_large_window_mode (self);
-#line 2599 "DataImportsUI.c"
+#line 2578 "DataImportsUI.c"
} else {
- SpitDataImportsDialogPaneGeometryOptions _tmp13_ = 0;
+ SpitDataImportsDialogPaneGeometryOptions _tmp13_;
#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp13_ = geometry_options;
#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
#line 450 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_colossal_window_mode (self);
-#line 2608 "DataImportsUI.c"
+#line 2587 "DataImportsUI.c"
} else {
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
-#line 2612 "DataImportsUI.c"
+#line 2591 "DataImportsUI.c"
}
}
#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2625,11 +2604,11 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
#line 455 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (self);
-#line 2621 "DataImportsUI.c"
+#line 2600 "DataImportsUI.c"
} else {
#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (self);
-#line 2625 "DataImportsUI.c"
+#line 2604 "DataImportsUI.c"
}
#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp15_ = pane;
@@ -2643,7 +2622,7 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
_tmp17_ = pane;
#line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spit_data_imports_dialog_pane_on_pane_installed (_tmp17_);
-#line 2639 "DataImportsUI.c"
+#line 2618 "DataImportsUI.c"
}
@@ -2654,18 +2633,18 @@ static void data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImp
g_type_class_add_private (klass, sizeof (DataImportsUIDataImportsDialogPrivate));
#line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (klass)->finalize = data_imports_ui_data_imports_dialog_finalize;
-#line 2650 "DataImportsUI.c"
+#line 2629 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self) {
#line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv = DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE (self);
-#line 2657 "DataImportsUI.c"
+#line 2636 "DataImportsUI.c"
}
-static void data_imports_ui_data_imports_dialog_finalize (GObject* obj) {
+static void data_imports_ui_data_imports_dialog_finalize (GObject * obj) {
DataImportsUIDataImportsDialog * self;
#line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG, DataImportsUIDataImportsDialog);
@@ -2681,7 +2660,7 @@ static void data_imports_ui_data_imports_dialog_finalize (GObject* obj) {
_g_object_unref0 (self->priv->host);
#line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (data_imports_ui_data_imports_dialog_parent_class)->finalize (obj);
-#line 2677 "DataImportsUI.c"
+#line 2656 "DataImportsUI.c"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 04:20:44 +0000