summaryrefslogtreecommitdiff
path: root/src/data_imports
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
commit2b3f22361da0c1d8e6ce70d71352821758186db7 (patch)
tree5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/data_imports
parent211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parentdc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/data_imports')
-rw-r--r--src/data_imports/DataImportJob.c168
-rw-r--r--src/data_imports/DataImportSource.c759
-rw-r--r--src/data_imports/DataImportSource.vala12
-rw-r--r--src/data_imports/DataImports.c6
-rw-r--r--src/data_imports/DataImportsPluginHost.c341
-rw-r--r--src/data_imports/DataImportsUI.c1290
-rw-r--r--src/data_imports/DataImportsUI.vala5
7 files changed, 1205 insertions, 1376 deletions
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 5b62a91..c9fdbcb 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -259,11 +259,13 @@ struct _BatchImportJobClass {
gchar* (*get_basename) (BatchImportJob* self);
gchar* (*get_path) (BatchImportJob* self);
DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
+ GFile* (*get_associated_file) (BatchImportJob* self);
void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
time_t (*get_exposure_time_override) (BatchImportJob* self);
+ gboolean (*recurse) (BatchImportJob* self);
};
struct _SpitDataImportsDataImportJob {
@@ -439,7 +441,7 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
static gpointer _spit_data_imports_data_import_source_ref0 (gpointer self) {
#line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return self ? spit_data_imports_data_import_source_ref (self) : NULL;
-#line 443 "DataImportJob.c"
+#line 445 "DataImportJob.c"
}
@@ -487,21 +489,21 @@ SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType
self->priv->exposure_time = _tmp7_;
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return self;
-#line 491 "DataImportJob.c"
+#line 493 "DataImportJob.c"
}
SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source) {
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return spit_data_imports_data_import_job_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, import_source);
-#line 498 "DataImportJob.c"
+#line 500 "DataImportJob.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return self ? g_object_ref (self) : NULL;
-#line 505 "DataImportJob.c"
+#line 507 "DataImportJob.c"
}
@@ -525,7 +527,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
_tmp1_ = src_tags;
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp1__length1 = src_tags_length1;
-#line 529 "DataImportJob.c"
+#line 531 "DataImportJob.c"
{
SpitDataImportsImportableTag** src_tag_collection = NULL;
gint src_tag_collection_length1 = 0;
@@ -537,14 +539,14 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
src_tag_collection_length1 = _tmp1__length1;
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
for (src_tag_it = 0; src_tag_it < _tmp1__length1; src_tag_it = src_tag_it + 1) {
-#line 541 "DataImportJob.c"
+#line 543 "DataImportJob.c"
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]);
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
src_tag = _tmp2_;
-#line 548 "DataImportJob.c"
+#line 550 "DataImportJob.c"
{
gchar* prepped = NULL;
SpitDataImportsImportableTag* _tmp3_;
@@ -588,7 +590,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
_tmp13_ = prepped;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp13_ != NULL) {
-#line 592 "DataImportJob.c"
+#line 594 "DataImportJob.c"
const gchar* _tmp14_;
gboolean _tmp15_;
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -597,15 +599,15 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
_tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING);
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp12_ = _tmp15_;
-#line 601 "DataImportJob.c"
+#line 603 "DataImportJob.c"
} else {
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp12_ = FALSE;
-#line 605 "DataImportJob.c"
+#line 607 "DataImportJob.c"
}
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp12_) {
-#line 609 "DataImportJob.c"
+#line 611 "DataImportJob.c"
GeeSet* _tmp16_;
const gchar* _tmp17_;
GeeList* parents = NULL;
@@ -623,7 +625,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
_tmp19_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp18_);
#line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
parents = _tmp19_;
-#line 627 "DataImportJob.c"
+#line 629 "DataImportJob.c"
{
GeeList* _parent_list = NULL;
GeeList* _tmp20_;
@@ -651,7 +653,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
_parent_index = -1;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
while (TRUE) {
-#line 655 "DataImportJob.c"
+#line 657 "DataImportJob.c"
gint _tmp25_;
gint _tmp26_;
gint _tmp27_;
@@ -673,7 +675,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
if (!(_tmp26_ < _tmp27_)) {
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
break;
-#line 677 "DataImportJob.c"
+#line 679 "DataImportJob.c"
}
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp28_ = _parent_list;
@@ -691,21 +693,21 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp32_);
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (parent);
-#line 695 "DataImportJob.c"
+#line 697 "DataImportJob.c"
}
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_parent_list);
-#line 699 "DataImportJob.c"
+#line 701 "DataImportJob.c"
}
#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (parents);
-#line 703 "DataImportJob.c"
+#line 705 "DataImportJob.c"
}
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (prepped);
#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (src_tag);
-#line 709 "DataImportJob.c"
+#line 711 "DataImportJob.c"
}
}
}
@@ -717,7 +719,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
_tmp36_ = _tmp35_;
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp36_ > 0) {
-#line 721 "DataImportJob.c"
+#line 723 "DataImportJob.c"
GeeSet* _tmp37_;
HierarchicalTagIndex* _tmp38_;
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -728,13 +730,13 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
_hierarchical_tag_index_unref0 (_tmp33_);
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp33_ = _tmp38_;
-#line 732 "DataImportJob.c"
+#line 734 "DataImportJob.c"
} else {
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_hierarchical_tag_index_unref0 (_tmp33_);
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp33_ = NULL;
-#line 738 "DataImportJob.c"
+#line 740 "DataImportJob.c"
}
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
result = _tmp33_;
@@ -742,7 +744,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
_g_object_unref0 (detected_htags);
#line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 746 "DataImportJob.c"
+#line 748 "DataImportJob.c"
}
@@ -757,7 +759,7 @@ time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataI
result = _tmp0_;
#line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 761 "DataImportJob.c"
+#line 763 "DataImportJob.c"
}
@@ -776,7 +778,7 @@ static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchI
result = _tmp1_;
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 780 "DataImportJob.c"
+#line 782 "DataImportJob.c"
}
@@ -795,7 +797,7 @@ static gchar* spit_data_imports_data_import_job_real_get_source_identifier (Batc
result = _tmp1_;
#line 60 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 799 "DataImportJob.c"
+#line 801 "DataImportJob.c"
}
@@ -808,7 +810,7 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
result = FALSE;
#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 812 "DataImportJob.c"
+#line 814 "DataImportJob.c"
}
@@ -827,7 +829,7 @@ static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJo
result = _tmp1_;
#line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 831 "DataImportJob.c"
+#line 833 "DataImportJob.c"
}
@@ -857,14 +859,14 @@ static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* b
result = _tmp4_;
#line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 861 "DataImportJob.c"
+#line 863 "DataImportJob.c"
}
static gpointer _batch_import_job_ref0 (gpointer self) {
#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return self ? batch_import_job_ref (self) : NULL;
-#line 868 "DataImportJob.c"
+#line 870 "DataImportJob.c"
}
@@ -884,7 +886,7 @@ static void spit_data_imports_data_import_job_real_set_associated (BatchImportJo
_batch_import_job_unref0 (self->priv->associated);
#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self->priv->associated = _tmp1_;
-#line 888 "DataImportJob.c"
+#line 890 "DataImportJob.c"
}
@@ -910,21 +912,21 @@ static gboolean spit_data_imports_data_import_job_real_determine_file_size (Batc
if (filesize) {
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
*filesize = _vala_filesize;
-#line 914 "DataImportJob.c"
+#line 916 "DataImportJob.c"
}
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (file) {
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
*file = _vala_file;
-#line 920 "DataImportJob.c"
+#line 922 "DataImportJob.c"
} else {
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_vala_file);
-#line 924 "DataImportJob.c"
+#line 926 "DataImportJob.c"
}
#line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 928 "DataImportJob.c"
+#line 930 "DataImportJob.c"
}
@@ -983,21 +985,21 @@ static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob*
if (file_to_import) {
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
*file_to_import = _vala_file_to_import;
-#line 987 "DataImportJob.c"
+#line 989 "DataImportJob.c"
} else {
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 991 "DataImportJob.c"
+#line 993 "DataImportJob.c"
}
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (copy_to_library) {
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
*copy_to_library = _vala_copy_to_library;
-#line 997 "DataImportJob.c"
+#line 999 "DataImportJob.c"
}
#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 1001 "DataImportJob.c"
+#line 1003 "DataImportJob.c"
}
@@ -1065,7 +1067,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_g_object_unref0 (photo);
#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 1069 "DataImportJob.c"
+#line 1071 "DataImportJob.c"
}
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp3_ = self->priv->import_source;
@@ -1077,7 +1079,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp5_ = self->priv->detected_htags;
#line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp5_ != NULL) {
-#line 1081 "DataImportJob.c"
+#line 1083 "DataImportJob.c"
GeeCollection* paths = NULL;
HierarchicalTagIndex* _tmp6_;
GeeCollection* _tmp7_;
@@ -1087,7 +1089,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp7_ = hierarchical_tag_index_get_all_paths (_tmp6_);
#line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
paths = _tmp7_;
-#line 1091 "DataImportJob.c"
+#line 1093 "DataImportJob.c"
{
GeeIterator* _path_it = NULL;
GeeCollection* _tmp8_;
@@ -1100,7 +1102,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_path_it = _tmp9_;
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
while (TRUE) {
-#line 1104 "DataImportJob.c"
+#line 1106 "DataImportJob.c"
GeeIterator* _tmp10_;
gboolean _tmp11_;
gchar* path = NULL;
@@ -1117,7 +1119,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
if (!_tmp11_) {
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
break;
-#line 1121 "DataImportJob.c"
+#line 1123 "DataImportJob.c"
}
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp12_ = _path_it;
@@ -1135,15 +1137,15 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_g_object_unref0 (_tmp16_);
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (path);
-#line 1139 "DataImportJob.c"
+#line 1141 "DataImportJob.c"
}
#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_path_it);
-#line 1143 "DataImportJob.c"
+#line 1145 "DataImportJob.c"
}
#line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (paths);
-#line 1147 "DataImportJob.c"
+#line 1149 "DataImportJob.c"
}
#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp17_ = src_photo;
@@ -1159,7 +1161,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp20_ = src_tags;
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp20__length1 = src_tags_length1;
-#line 1163 "DataImportJob.c"
+#line 1165 "DataImportJob.c"
{
SpitDataImportsImportableTag** src_tag_collection = NULL;
gint src_tag_collection_length1 = 0;
@@ -1171,14 +1173,14 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
src_tag_collection_length1 = _tmp20__length1;
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
for (src_tag_it = 0; src_tag_it < _tmp20__length1; src_tag_it = src_tag_it + 1) {
-#line 1175 "DataImportJob.c"
+#line 1177 "DataImportJob.c"
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]);
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
src_tag = _tmp21_;
-#line 1182 "DataImportJob.c"
+#line 1184 "DataImportJob.c"
{
gchar* prepped = NULL;
SpitDataImportsImportableTag* _tmp22_;
@@ -1221,7 +1223,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp31_ = prepped;
#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp31_ != NULL) {
-#line 1225 "DataImportJob.c"
+#line 1227 "DataImportJob.c"
const gchar* _tmp32_;
GeeList* _tmp33_;
GeeList* _tmp34_;
@@ -1248,7 +1250,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_g_object_unref0 (_tmp34_);
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp37_) {
-#line 1252 "DataImportJob.c"
+#line 1254 "DataImportJob.c"
const gchar* _tmp38_;
gboolean _tmp39_;
#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1257,7 +1259,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp39_ = g_str_has_prefix (_tmp38_, TAG_PATH_SEPARATOR_STRING);
#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp39_) {
-#line 1261 "DataImportJob.c"
+#line 1263 "DataImportJob.c"
const gchar* _tmp40_;
gchar* _tmp41_;
#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1268,7 +1270,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_g_free0 (prepped);
#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
prepped = _tmp41_;
-#line 1272 "DataImportJob.c"
+#line 1274 "DataImportJob.c"
}
} else {
GeeList* parents = NULL;
@@ -1320,7 +1322,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp53_ = tag_source_collection_exists (_tmp51_, _tmp52_, FALSE);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp53_) {
-#line 1324 "DataImportJob.c"
+#line 1326 "DataImportJob.c"
const gchar* _tmp54_;
Tag* _tmp55_;
Tag* _tmp56_;
@@ -1334,7 +1336,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
tag_promote (_tmp56_);
#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_tmp56_);
-#line 1338 "DataImportJob.c"
+#line 1340 "DataImportJob.c"
}
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (flat_top_level_parent);
@@ -1342,7 +1344,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_g_free0 (top_level_parent);
#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (parents);
-#line 1346 "DataImportJob.c"
+#line 1348 "DataImportJob.c"
}
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp57_ = prepped;
@@ -1356,13 +1358,13 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (_tmp59_);
-#line 1360 "DataImportJob.c"
+#line 1362 "DataImportJob.c"
}
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (prepped);
#line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (src_tag);
-#line 1366 "DataImportJob.c"
+#line 1368 "DataImportJob.c"
}
}
}
@@ -1376,7 +1378,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp63_ = src_event;
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp63_ != NULL) {
-#line 1380 "DataImportJob.c"
+#line 1382 "DataImportJob.c"
gchar* prepped = NULL;
SpitDataImportsImportableEvent* _tmp64_;
gchar* _tmp65_;
@@ -1402,7 +1404,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp69_ = prepped;
#line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp69_ != NULL) {
-#line 1406 "DataImportJob.c"
+#line 1408 "DataImportJob.c"
LibraryPhoto* _tmp70_;
BatchImportRoll* _tmp71_;
ViewCollection* _tmp72_;
@@ -1417,11 +1419,11 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp73_ = prepped;
#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_SOURCE, MediaSource), _tmp72_, _tmp73_);
-#line 1421 "DataImportJob.c"
+#line 1423 "DataImportJob.c"
}
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (prepped);
-#line 1425 "DataImportJob.c"
+#line 1427 "DataImportJob.c"
}
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp74_ = src_photo;
@@ -1437,7 +1439,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
if (_tmp77_) {
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
dst_rating = RATING_REJECTED;
-#line 1441 "DataImportJob.c"
+#line 1443 "DataImportJob.c"
} else {
SpitDataImportsImportableRating* _tmp78_;
gboolean _tmp79_;
@@ -1449,7 +1451,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
if (_tmp79_) {
#line 152 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
dst_rating = RATING_UNRATED;
-#line 1453 "DataImportJob.c"
+#line 1455 "DataImportJob.c"
} else {
SpitDataImportsImportableRating* _tmp80_;
gint _tmp81_;
@@ -1462,7 +1464,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp82_ = rating_unserialize (_tmp81_);
#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
dst_rating = _tmp82_;
-#line 1466 "DataImportJob.c"
+#line 1468 "DataImportJob.c"
}
}
#line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1481,7 +1483,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp87_ = title;
#line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp87_ != NULL) {
-#line 1485 "DataImportJob.c"
+#line 1487 "DataImportJob.c"
LibraryPhoto* _tmp88_;
const gchar* _tmp89_;
#line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1490,7 +1492,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp89_ = title;
#line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_MEDIA_SOURCE, MediaSource), _tmp89_);
-#line 1494 "DataImportJob.c"
+#line 1496 "DataImportJob.c"
}
#line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp90_ = src_photo;
@@ -1502,7 +1504,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp92_ = date_time;
#line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (_tmp92_ != NULL) {
-#line 1506 "DataImportJob.c"
+#line 1508 "DataImportJob.c"
LibraryPhoto* _tmp93_;
time_t* _tmp94_;
#line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1511,7 +1513,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_tmp94_ = date_time;
#line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_DATEABLE, Dateable), *_tmp94_);
-#line 1515 "DataImportJob.c"
+#line 1517 "DataImportJob.c"
}
#line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp95_ = photo;
@@ -1539,7 +1541,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
_g_object_unref0 (photo);
#line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 1543 "DataImportJob.c"
+#line 1545 "DataImportJob.c"
}
@@ -1560,7 +1562,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
_tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
components = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 1564 "DataImportJob.c"
+#line 1566 "DataImportJob.c"
{
SpitDataImportsImportableTag* current_tag = NULL;
SpitDataImportsImportableTag* _tmp1_;
@@ -1571,14 +1573,14 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
_tmp2_ = _g_object_ref0 (_tmp1_);
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
current_tag = _tmp2_;
-#line 1575 "DataImportJob.c"
+#line 1577 "DataImportJob.c"
{
gboolean _tmp3_ = FALSE;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp3_ = TRUE;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
while (TRUE) {
-#line 1582 "DataImportJob.c"
+#line 1584 "DataImportJob.c"
SpitDataImportsImportableTag* _tmp6_;
GeeList* _tmp7_;
SpitDataImportsImportableTag* _tmp8_;
@@ -1588,7 +1590,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
gchar* _tmp12_;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
if (!_tmp3_) {
-#line 1592 "DataImportJob.c"
+#line 1594 "DataImportJob.c"
SpitDataImportsImportableTag* _tmp4_;
SpitDataImportsImportableTag* _tmp5_;
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1599,7 +1601,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
_g_object_unref0 (current_tag);
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
current_tag = _tmp5_;
-#line 1603 "DataImportJob.c"
+#line 1605 "DataImportJob.c"
}
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp3_ = FALSE;
@@ -1609,7 +1611,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
if (!(_tmp6_ != NULL)) {
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
break;
-#line 1613 "DataImportJob.c"
+#line 1615 "DataImportJob.c"
}
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp7_ = components;
@@ -1629,12 +1631,12 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
_g_free0 (_tmp12_);
#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_free0 (_tmp10_);
-#line 1633 "DataImportJob.c"
+#line 1635 "DataImportJob.c"
}
}
#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_g_object_unref0 (current_tag);
-#line 1638 "DataImportJob.c"
+#line 1640 "DataImportJob.c"
}
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
_tmp13_ = components;
@@ -1648,7 +1650,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
if (result_length1) {
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
*result_length1 = _tmp16__length1;
-#line 1652 "DataImportJob.c"
+#line 1654 "DataImportJob.c"
}
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
result = _tmp16_;
@@ -1656,7 +1658,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
_g_object_unref0 (components);
#line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
return result;
-#line 1660 "DataImportJob.c"
+#line 1662 "DataImportJob.c"
}
@@ -1685,7 +1687,7 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp
((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
-#line 1689 "DataImportJob.c"
+#line 1691 "DataImportJob.c"
}
@@ -1696,7 +1698,7 @@ static void spit_data_imports_data_import_job_instance_init (SpitDataImportsData
self->priv->associated = NULL;
#line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
self->priv->detected_htags = NULL;
-#line 1700 "DataImportJob.c"
+#line 1702 "DataImportJob.c"
}
@@ -1714,7 +1716,7 @@ static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
_hierarchical_tag_index_unref0 (self->priv->detected_htags);
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
BATCH_IMPORT_JOB_CLASS (spit_data_imports_data_import_job_parent_class)->finalize (obj);
-#line 1718 "DataImportJob.c"
+#line 1720 "DataImportJob.c"
}
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 715b62a..d3990dc 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -63,17 +63,6 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
#define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL)))
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define TYPE_PHOTO_PREVIEW (photo_preview_get_type ())
-#define PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_PREVIEW, PhotoPreview))
-#define PHOTO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_PREVIEW, PhotoPreviewClass))
-#define IS_PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_PREVIEW))
-#define IS_PHOTO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_PREVIEW))
-#define PHOTO_PREVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_PREVIEW, PhotoPreviewClass))
-
-typedef struct _PhotoPreview PhotoPreview;
-typedef struct _PhotoPreviewClass PhotoPreviewClass;
-#define _photo_preview_unref0(var) ((var == NULL) ? NULL : (var = (photo_preview_unref (var), NULL)))
-
#define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
typedef struct _SpitDataImportsParamSpecDataImportSource SpitDataImportsParamSpecDataImportSource;
@@ -150,16 +139,7 @@ gchar* media_metadata_get_title (MediaMetadata* self);
MetadataDateTime* metadata_date_time_new (time_t timestamp);
MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp);
MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self);
-gpointer photo_preview_ref (gpointer instance);
-void photo_preview_unref (gpointer instance);
-GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_preview (GValue* value, gpointer v_object);
-void value_take_photo_preview (GValue* value, gpointer v_object);
-gpointer value_get_photo_preview (const GValue* value);
-GType photo_preview_get_type (void) G_GNUC_CONST;
-PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
-guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error);
-gchar* md5_binary (guint8* buffer, gsize length);
+gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self);
guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error);
time_t query_file_modified (GFile* file, GError** error);
gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self);
@@ -184,21 +164,14 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm
static gpointer _g_object_ref0 (gpointer self) {
#line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return self ? g_object_ref (self) : NULL;
-#line 188 "DataImportSource.c"
+#line 168 "DataImportSource.c"
}
static gpointer _metadata_date_time_ref0 (gpointer self) {
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return self ? metadata_date_time_ref (self) : NULL;
-#line 195 "DataImportSource.c"
-}
-
-
-static gpointer _photo_preview_ref0 (gpointer self) {
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- return self ? photo_preview_ref (self) : NULL;
-#line 202 "DataImportSource.c"
+#line 175 "DataImportSource.c"
}
@@ -248,21 +221,21 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_tmp7_ = folder_path;
#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp7_ != NULL) {
-#line 252 "DataImportSource.c"
+#line 225 "DataImportSource.c"
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"
_tmp6_ = _tmp8_ != NULL;
-#line 258 "DataImportSource.c"
+#line 231 "DataImportSource.c"
} else {
#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp6_ = FALSE;
-#line 262 "DataImportSource.c"
+#line 235 "DataImportSource.c"
}
#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp6_) {
-#line 266 "DataImportSource.c"
+#line 239 "DataImportSource.c"
SpitDataImportsImportableMediaItem* _tmp9_;
gchar* _tmp10_;
gchar* _tmp11_;
@@ -308,31 +281,31 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_tmp19_ = g_file_query_exists (_tmp18_, NULL);
#line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
self->priv->backing_file_found = _tmp19_;
-#line 312 "DataImportSource.c"
+#line 285 "DataImportSource.c"
} else {
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
self->priv->backing_file_found = FALSE;
-#line 316 "DataImportSource.c"
+#line 289 "DataImportSource.c"
}
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp21_ = photo;
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp21_ != NULL) {
-#line 322 "DataImportSource.c"
+#line 295 "DataImportSource.c"
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"
_tmp20_ = _tmp22_;
-#line 328 "DataImportSource.c"
+#line 301 "DataImportSource.c"
} else {
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp20_ = FALSE;
-#line 332 "DataImportSource.c"
+#line 305 "DataImportSource.c"
}
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp20_) {
-#line 336 "DataImportSource.c"
+#line 309 "DataImportSource.c"
PhotoMetadata* metadata = NULL;
PhotoMetadata* _tmp23_;
SpitDataImportsImportableMediaItem* _tmp30_;
@@ -342,16 +315,12 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
SpitDataImportsImportableMediaItem* _tmp38_;
time_t* _tmp39_;
time_t* _tmp40_;
- PhotoPreview* _tmp48_ = NULL;
- PhotoMetadata* _tmp49_;
- PhotoPreview* preview = NULL;
- PhotoPreview* _tmp52_;
- PhotoPreview* _tmp53_;
+ PhotoMetadata* _tmp48_;
#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"
+#line 324 "DataImportSource.c"
{
PhotoMetadata* _tmp24_;
GFile* _tmp25_;
@@ -363,12 +332,12 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp25_, &_inner_error_);
#line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 367 "DataImportSource.c"
- goto __catch218_g_error;
+#line 336 "DataImportSource.c"
+ goto __catch230_g_error;
}
}
- goto __finally218;
- __catch218_g_error:
+ goto __finally230;
+ __catch230_g_error:
{
GError* e = NULL;
gchar* _tmp26_;
@@ -397,9 +366,9 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
metadata = NULL;
#line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_error_free0 (e);
-#line 401 "DataImportSource.c"
+#line 370 "DataImportSource.c"
}
- __finally218:
+ __finally230:
#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"
@@ -416,7 +385,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
g_clear_error (&_inner_error_);
#line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return NULL;
-#line 420 "DataImportSource.c"
+#line 389 "DataImportSource.c"
}
#line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp30_ = db_photo;
@@ -430,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_tmp32_ = self->priv->title;
#line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp32_ == NULL) {
-#line 434 "DataImportSource.c"
+#line 403 "DataImportSource.c"
gchar* _tmp33_ = NULL;
PhotoMetadata* _tmp34_;
gchar* _tmp37_;
@@ -438,7 +407,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_tmp34_ = metadata;
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp34_ != NULL) {
-#line 442 "DataImportSource.c"
+#line 411 "DataImportSource.c"
PhotoMetadata* _tmp35_;
gchar* _tmp36_;
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -449,13 +418,13 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_g_free0 (_tmp33_);
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp33_ = _tmp36_;
-#line 453 "DataImportSource.c"
+#line 422 "DataImportSource.c"
} else {
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (_tmp33_);
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp33_ = NULL;
-#line 459 "DataImportSource.c"
+#line 428 "DataImportSource.c"
}
#line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp37_ = g_strdup (_tmp33_);
@@ -465,7 +434,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
self->priv->title = _tmp37_;
#line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (_tmp33_);
-#line 469 "DataImportSource.c"
+#line 438 "DataImportSource.c"
}
#line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp38_ = db_photo;
@@ -477,7 +446,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_tmp40_ = date_time;
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp40_ != NULL) {
-#line 481 "DataImportSource.c"
+#line 450 "DataImportSource.c"
time_t* _tmp41_;
MetadataDateTime* _tmp42_;
#line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -488,7 +457,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_metadata_date_time_unref0 (self->priv->exposure_time);
#line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
self->priv->exposure_time = _tmp42_;
-#line 492 "DataImportSource.c"
+#line 461 "DataImportSource.c"
} else {
MetadataDateTime* _tmp43_ = NULL;
PhotoMetadata* _tmp44_;
@@ -497,7 +466,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_tmp44_ = metadata;
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp44_ != NULL) {
-#line 501 "DataImportSource.c"
+#line 470 "DataImportSource.c"
PhotoMetadata* _tmp45_;
MetadataDateTime* _tmp46_;
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -508,13 +477,13 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_metadata_date_time_unref0 (_tmp43_);
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp43_ = _tmp46_;
-#line 512 "DataImportSource.c"
+#line 481 "DataImportSource.c"
} else {
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_metadata_date_time_unref0 (_tmp43_);
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp43_ = NULL;
-#line 518 "DataImportSource.c"
+#line 487 "DataImportSource.c"
}
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp47_ = _metadata_date_time_ref0 (_tmp43_);
@@ -524,315 +493,189 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
self->priv->exposure_time = _tmp47_;
#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_metadata_date_time_unref0 (_tmp43_);
-#line 528 "DataImportSource.c"
+#line 497 "DataImportSource.c"
}
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp49_ = metadata;
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- if (_tmp49_ != NULL) {
-#line 534 "DataImportSource.c"
- 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"
- _tmp51_ = photo_metadata_get_preview (_tmp50_, (guint) 0);
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _photo_preview_unref0 (_tmp48_);
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp48_ = _tmp51_;
-#line 545 "DataImportSource.c"
- } else {
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _photo_preview_unref0 (_tmp48_);
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp48_ = NULL;
-#line 551 "DataImportSource.c"
- }
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp52_ = _photo_preview_ref0 (_tmp48_);
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- preview = _tmp52_;
#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp53_ = preview;
+ _tmp48_ = metadata;
#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- if (_tmp53_ != NULL) {
-#line 561 "DataImportSource.c"
- {
- guint8* preview_raw = 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"
- _tmp56_ = photo_preview_flatten (_tmp54_, &_tmp55_, &_inner_error_);
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- preview_raw = _tmp56_;
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- preview_raw_length1 = _tmp55_;
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _preview_raw_size_ = preview_raw_length1;
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 586 "DataImportSource.c"
- goto __catch219_g_error;
- }
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp57_ = preview_raw;
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp57__length1 = preview_raw_length1;
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp58_ = preview_raw;
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp58__length1 = preview_raw_length1;
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp59_ = md5_binary (_tmp57_, (gsize) _tmp58__length1);
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_free0 (self->priv->preview_md5);
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- self->priv->preview_md5 = _tmp59_;
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- preview_raw = (g_free (preview_raw), NULL);
-#line 605 "DataImportSource.c"
- }
- goto __finally219;
- __catch219_g_error:
- {
- GError* e = 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"
- _inner_error_ = NULL;
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp60_ = spit_data_imports_data_import_source_get_filename (self);
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp61_ = _tmp60_;
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp62_ = e;
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp63_ = _tmp62_->message;
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- g_warning ("DataImportSource.vala:67: Could not get raw preview for %s: %s", _tmp61_, _tmp63_);
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_free0 (_tmp61_);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_error_free0 (e);
-#line 633 "DataImportSource.c"
- }
- __finally219:
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ if (_tmp48_ != NULL) {
+#line 503 "DataImportSource.c"
+ PhotoMetadata* _tmp49_;
+ gchar* _tmp50_;
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _photo_preview_unref0 (preview);
+ _tmp49_ = metadata;
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _photo_preview_unref0 (_tmp48_);
+ _tmp50_ = photo_metadata_thumbnail_hash (_tmp49_);
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_free0 (date_time);
+ _g_free0 (self->priv->preview_md5);
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _media_metadata_unref0 (metadata);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_object_unref0 (photo);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_free0 (filename);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_free0 (folder_path);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- g_clear_error (&_inner_error_);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- return NULL;
-#line 658 "DataImportSource.c"
- }
+ self->priv->preview_md5 = _tmp50_;
+#line 514 "DataImportSource.c"
}
{
- guint64 _tmp64_ = 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"
- _tmp66_ = query_total_file_size (_tmp65_, NULL, &_inner_error_);
-#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp64_ = _tmp66_;
-#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ guint64 _tmp51_ = 0ULL;
+ GFile* _tmp52_;
+ guint64 _tmp53_;
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp52_ = photo;
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp53_ = query_total_file_size (_tmp52_, NULL, &_inner_error_);
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp51_ = _tmp53_;
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 673 "DataImportSource.c"
- goto __catch220_g_error;
+#line 528 "DataImportSource.c"
+ goto __catch231_g_error;
}
-#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- self->priv->file_size = _tmp64_;
-#line 678 "DataImportSource.c"
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ self->priv->file_size = _tmp51_;
+#line 533 "DataImportSource.c"
}
- goto __finally220;
- __catch220_g_error:
+ goto __finally231;
+ __catch231_g_error:
{
GError* e = NULL;
- gchar* _tmp67_;
- gchar* _tmp68_;
- GError* _tmp69_;
- const gchar* _tmp70_;
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ gchar* _tmp54_;
+ gchar* _tmp55_;
+ GError* _tmp56_;
+ const gchar* _tmp57_;
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
e = _inner_error_;
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_inner_error_ = NULL;
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp67_ = spit_data_imports_data_import_source_get_filename (self);
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp68_ = _tmp67_;
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp69_ = e;
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp70_ = _tmp69_->message;
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- g_warning ("DataImportSource.vala:77: Could not get file size for %s: %s", _tmp68_, _tmp70_);
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_free0 (_tmp68_);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp54_ = spit_data_imports_data_import_source_get_filename (self);
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp55_ = _tmp54_;
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp56_ = e;
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp57_ = _tmp56_->message;
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ g_warning ("DataImportSource.vala:73: Could not get file size for %s: %s", _tmp55_, _tmp57_);
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _g_free0 (_tmp55_);
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_error_free0 (e);
-#line 706 "DataImportSource.c"
+#line 561 "DataImportSource.c"
}
- __finally220:
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ __finally231:
+#line 70 "/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"
- _photo_preview_unref0 (preview);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _photo_preview_unref0 (_tmp48_);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (date_time);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_media_metadata_unref0 (metadata);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_object_unref0 (photo);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (filename);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (folder_path);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_clear_error (&_inner_error_);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return NULL;
-#line 731 "DataImportSource.c"
+#line 582 "DataImportSource.c"
}
{
- time_t _tmp71_ = 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"
- _tmp73_ = query_file_modified (_tmp72_, &_inner_error_);
-#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp71_ = _tmp73_;
-#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ time_t _tmp58_ = 0;
+ GFile* _tmp59_;
+ time_t _tmp60_;
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp59_ = photo;
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp60_ = query_file_modified (_tmp59_, &_inner_error_);
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp58_ = _tmp60_;
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 745 "DataImportSource.c"
- goto __catch221_g_error;
+#line 596 "DataImportSource.c"
+ goto __catch232_g_error;
}
-#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- self->priv->modification_time = _tmp71_;
-#line 750 "DataImportSource.c"
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ self->priv->modification_time = _tmp58_;
+#line 601 "DataImportSource.c"
}
- goto __finally221;
- __catch221_g_error:
+ goto __finally232;
+ __catch232_g_error:
{
GError* e = NULL;
- gchar* _tmp74_;
- gchar* _tmp75_;
- GError* _tmp76_;
- const gchar* _tmp77_;
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ gchar* _tmp61_;
+ gchar* _tmp62_;
+ GError* _tmp63_;
+ const gchar* _tmp64_;
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
e = _inner_error_;
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_inner_error_ = NULL;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp74_ = spit_data_imports_data_import_source_get_filename (self);
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp75_ = _tmp74_;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp76_ = e;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp77_ = _tmp76_->message;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- g_warning ("DataImportSource.vala:82: Could not get modification time for %s: %s", _tmp75_, _tmp77_);
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_free0 (_tmp75_);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp61_ = spit_data_imports_data_import_source_get_filename (self);
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp62_ = _tmp61_;
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp63_ = e;
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp64_ = _tmp63_->message;
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ g_warning ("DataImportSource.vala:78: Could not get modification time for %s: %s", _tmp62_, _tmp64_);
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _g_free0 (_tmp62_);
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_error_free0 (e);
-#line 778 "DataImportSource.c"
+#line 629 "DataImportSource.c"
}
- __finally221:
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ __finally232:
+#line 75 "/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"
- _photo_preview_unref0 (preview);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _photo_preview_unref0 (_tmp48_);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (date_time);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_media_metadata_unref0 (metadata);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_object_unref0 (photo);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (filename);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (folder_path);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_clear_error (&_inner_error_);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return NULL;
-#line 803 "DataImportSource.c"
+#line 650 "DataImportSource.c"
}
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _photo_preview_unref0 (preview);
-#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _photo_preview_unref0 (_tmp48_);
-#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (date_time);
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_media_metadata_unref0 (metadata);
-#line 813 "DataImportSource.c"
+#line 656 "DataImportSource.c"
} else {
- 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"
- _tmp79_ = g_file_get_path (_tmp78_);
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp80_ = _tmp79_;
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp81_ = g_strdup_printf ("Photo file %s not found", _tmp80_);
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _tmp82_ = _tmp81_;
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- g_debug ("DataImportSource.vala:85: %s", _tmp82_);
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_free0 (_tmp82_);
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
- _g_free0 (_tmp80_);
-#line 836 "DataImportSource.c"
+ GFile* _tmp65_;
+ gchar* _tmp66_;
+ gchar* _tmp67_;
+ gchar* _tmp68_;
+ gchar* _tmp69_;
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp65_ = photo;
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp66_ = g_file_get_path (_tmp65_);
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp67_ = _tmp66_;
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp68_ = g_strdup_printf ("Photo file %s not found", _tmp67_);
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _tmp69_ = _tmp68_;
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ g_debug ("DataImportSource.vala:81: %s", _tmp69_);
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _g_free0 (_tmp69_);
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+ _g_free0 (_tmp67_);
+#line 679 "DataImportSource.c"
}
#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_object_unref0 (photo);
@@ -842,14 +685,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
_g_free0 (folder_path);
#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return self;
-#line 846 "DataImportSource.c"
+#line 689 "DataImportSource.c"
}
SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo) {
#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return spit_data_imports_data_import_source_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, db_photo);
-#line 853 "DataImportSource.c"
+#line 696 "DataImportSource.c"
}
@@ -857,17 +700,17 @@ gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImp
gchar* result = NULL;
SpitDataImportsImportableMediaItem* _tmp0_;
gchar* _tmp1_;
-#line 89 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 85 "/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"
+#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = self->priv->db_photo;
-#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp1_ = spit_data_imports_importable_media_item_get_filename (_tmp0_);
-#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp1_;
-#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 871 "DataImportSource.c"
+#line 714 "DataImportSource.c"
}
@@ -875,17 +718,17 @@ gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImpo
gchar* result = NULL;
SpitDataImportsImportableMediaItem* _tmp0_;
gchar* _tmp1_;
-#line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#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 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = self->priv->db_photo;
-#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp1_ = spit_data_imports_importable_media_item_get_folder_path (_tmp0_);
-#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp1_;
-#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 889 "DataImportSource.c"
+#line 732 "DataImportSource.c"
}
@@ -899,35 +742,35 @@ GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportS
gchar* _tmp5_;
GFile* _tmp6_;
GFile* _tmp7_;
-#line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#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 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = spit_data_imports_data_import_source_get_fulldir (self);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp1_ = _tmp0_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp3_ = _tmp2_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp4_ = spit_data_imports_data_import_source_get_filename (self);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp5_ = _tmp4_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp6_ = g_file_get_child (_tmp3_, _tmp5_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp7_ = _tmp6_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (_tmp5_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_object_unref0 (_tmp3_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (_tmp1_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp7_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 931 "DataImportSource.c"
+#line 774 "DataImportSource.c"
}
@@ -936,41 +779,41 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS
gchar* _tmp0_ = NULL;
const gchar* _tmp1_;
gboolean _tmp2_;
-#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#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 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp1_ = self->priv->title;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp2_ = is_string_empty (_tmp1_);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (!_tmp2_) {
-#line 948 "DataImportSource.c"
+#line 791 "DataImportSource.c"
const gchar* _tmp3_;
gchar* _tmp4_;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp3_ = self->priv->title;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp4_ = g_strdup (_tmp3_);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (_tmp0_);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = _tmp4_;
-#line 959 "DataImportSource.c"
+#line 802 "DataImportSource.c"
} else {
gchar* _tmp5_;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/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"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (_tmp0_);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = _tmp5_;
-#line 968 "DataImportSource.c"
+#line 811 "DataImportSource.c"
}
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp0_;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 974 "DataImportSource.c"
+#line 817 "DataImportSource.c"
}
@@ -978,17 +821,17 @@ gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImport
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
-#line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#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 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = self->priv->title;
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp1_;
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 992 "DataImportSource.c"
+#line 835 "DataImportSource.c"
}
@@ -998,38 +841,38 @@ PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataIm
gchar* _tmp1_;
PhotoFileFormat _tmp2_;
PhotoFileFormat _tmp3_;
-#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 105 "/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"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = spit_data_imports_data_import_source_get_filename (self);
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp1_ = _tmp0_;
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp2_ = photo_file_format_get_by_basename_extension (_tmp1_);
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp3_ = _tmp2_;
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_g_free0 (_tmp1_);
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 1018 "DataImportSource.c"
+#line 861 "DataImportSource.c"
}
gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self) {
gchar* result = NULL;
gchar* _tmp0_;
-#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 109 "/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"
+#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = spit_data_imports_data_import_source_get_name (self);
-#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp0_;
-#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 1033 "DataImportSource.c"
+#line 876 "DataImportSource.c"
}
@@ -1037,50 +880,50 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa
time_t result = 0;
time_t _tmp0_ = 0;
MetadataDateTime* _tmp1_;
-#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 113 "/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"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp1_ = self->priv->exposure_time;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp1_ != NULL) {
-#line 1047 "DataImportSource.c"
+#line 890 "DataImportSource.c"
MetadataDateTime* _tmp2_;
time_t _tmp3_;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/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"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp3_ = metadata_date_time_get_timestamp (_tmp2_);
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = _tmp3_;
-#line 1056 "DataImportSource.c"
+#line 899 "DataImportSource.c"
} else {
time_t _tmp4_;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/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"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = _tmp4_;
-#line 1063 "DataImportSource.c"
+#line 906 "DataImportSource.c"
}
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp0_;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 1069 "DataImportSource.c"
+#line 912 "DataImportSource.c"
}
guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self) {
guint64 result = 0ULL;
guint64 _tmp0_;
-#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 117 "/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"
+#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = self->priv->file_size;
-#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp0_;
-#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 1084 "DataImportSource.c"
+#line 927 "DataImportSource.c"
}
@@ -1088,17 +931,17 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho
SpitDataImportsImportableMediaItem* result = NULL;
SpitDataImportsImportableMediaItem* _tmp0_;
SpitDataImportsImportableMediaItem* _tmp1_;
-#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 121 "/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"
+#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = self->priv->db_photo;
-#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp1_;
-#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 1102 "DataImportSource.c"
+#line 945 "DataImportSource.c"
}
@@ -1106,57 +949,57 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
const gchar* _tmp1_;
-#line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 125 "/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"
+#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp1_ = self->priv->preview_md5;
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (_tmp1_ != NULL) {
-#line 1116 "DataImportSource.c"
+#line 959 "DataImportSource.c"
const gchar* _tmp2_;
PhotoFileFormat _tmp3_;
gboolean _tmp4_;
-#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 128 "/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"
+#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp3_ = spit_data_imports_data_import_source_get_file_format (self);
-#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp4_ = library_photo_has_nontrash_duplicate (NULL, _tmp2_, NULL, _tmp3_);
-#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = _tmp4_;
-#line 1128 "DataImportSource.c"
+#line 971 "DataImportSource.c"
} else {
-#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = FALSE;
-#line 1132 "DataImportSource.c"
+#line 975 "DataImportSource.c"
}
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp0_;
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 1138 "DataImportSource.c"
+#line 981 "DataImportSource.c"
}
gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self) {
gboolean result = FALSE;
gboolean _tmp0_;
-#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 132 "/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"
+#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_tmp0_ = self->priv->backing_file_found;
-#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
result = _tmp0_;
-#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return result;
-#line 1153 "DataImportSource.c"
+#line 996 "DataImportSource.c"
}
static void spit_data_imports_value_data_import_source_init (GValue* value) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
value->data[0].v_pointer = NULL;
-#line 1160 "DataImportSource.c"
+#line 1003 "DataImportSource.c"
}
@@ -1165,7 +1008,7 @@ static void spit_data_imports_value_data_import_source_free_value (GValue* value
if (value->data[0].v_pointer) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
spit_data_imports_data_import_source_unref (value->data[0].v_pointer);
-#line 1169 "DataImportSource.c"
+#line 1012 "DataImportSource.c"
}
}
@@ -1175,11 +1018,11 @@ static void spit_data_imports_value_data_import_source_copy_value (const GValue*
if (src_value->data[0].v_pointer) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
dest_value->data[0].v_pointer = spit_data_imports_data_import_source_ref (src_value->data[0].v_pointer);
-#line 1179 "DataImportSource.c"
+#line 1022 "DataImportSource.c"
} else {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1183 "DataImportSource.c"
+#line 1026 "DataImportSource.c"
}
}
@@ -1187,37 +1030,37 @@ static void spit_data_imports_value_data_import_source_copy_value (const GValue*
static gpointer spit_data_imports_value_data_import_source_peek_pointer (const GValue* value) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return value->data[0].v_pointer;
-#line 1191 "DataImportSource.c"
+#line 1034 "DataImportSource.c"
}
static gchar* spit_data_imports_value_data_import_source_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (collect_values[0].v_pointer) {
-#line 1198 "DataImportSource.c"
+#line 1041 "DataImportSource.c"
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) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1205 "DataImportSource.c"
+#line 1048 "DataImportSource.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.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 1209 "DataImportSource.c"
+#line 1052 "DataImportSource.c"
}
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
value->data[0].v_pointer = spit_data_imports_data_import_source_ref (object);
-#line 1213 "DataImportSource.c"
+#line 1056 "DataImportSource.c"
} else {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
value->data[0].v_pointer = NULL;
-#line 1217 "DataImportSource.c"
+#line 1060 "DataImportSource.c"
}
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return NULL;
-#line 1221 "DataImportSource.c"
+#line 1064 "DataImportSource.c"
}
@@ -1228,25 +1071,25 @@ static gchar* spit_data_imports_value_data_import_source_lcopy_value (const GVal
if (!object_p) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1232 "DataImportSource.c"
+#line 1075 "DataImportSource.c"
}
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (!value->data[0].v_pointer) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
*object_p = NULL;
-#line 1238 "DataImportSource.c"
+#line 1081 "DataImportSource.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
*object_p = value->data[0].v_pointer;
-#line 1242 "DataImportSource.c"
+#line 1085 "DataImportSource.c"
} else {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
*object_p = spit_data_imports_data_import_source_ref (value->data[0].v_pointer);
-#line 1246 "DataImportSource.c"
+#line 1089 "DataImportSource.c"
}
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return NULL;
-#line 1250 "DataImportSource.c"
+#line 1093 "DataImportSource.c"
}
@@ -1260,7 +1103,7 @@ GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return G_PARAM_SPEC (spec);
-#line 1264 "DataImportSource.c"
+#line 1107 "DataImportSource.c"
}
@@ -1269,7 +1112,7 @@ gpointer spit_data_imports_value_get_data_import_source (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE), NULL);
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return value->data[0].v_pointer;
-#line 1273 "DataImportSource.c"
+#line 1116 "DataImportSource.c"
}
@@ -1289,17 +1132,17 @@ void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_o
value->data[0].v_pointer = v_object;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
spit_data_imports_data_import_source_ref (value->data[0].v_pointer);
-#line 1293 "DataImportSource.c"
+#line 1136 "DataImportSource.c"
} else {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
value->data[0].v_pointer = NULL;
-#line 1297 "DataImportSource.c"
+#line 1140 "DataImportSource.c"
}
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (old) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
spit_data_imports_data_import_source_unref (old);
-#line 1303 "DataImportSource.c"
+#line 1146 "DataImportSource.c"
}
}
@@ -1318,17 +1161,17 @@ void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
value->data[0].v_pointer = v_object;
-#line 1322 "DataImportSource.c"
+#line 1165 "DataImportSource.c"
} else {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
value->data[0].v_pointer = NULL;
-#line 1326 "DataImportSource.c"
+#line 1169 "DataImportSource.c"
}
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
if (old) {
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
spit_data_imports_data_import_source_unref (old);
-#line 1332 "DataImportSource.c"
+#line 1175 "DataImportSource.c"
}
}
@@ -1340,7 +1183,7 @@ static void spit_data_imports_data_import_source_class_init (SpitDataImportsData
((SpitDataImportsDataImportSourceClass *) klass)->finalize = spit_data_imports_data_import_source_finalize;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_type_class_add_private (klass, sizeof (SpitDataImportsDataImportSourcePrivate));
-#line 1344 "DataImportSource.c"
+#line 1187 "DataImportSource.c"
}
@@ -1353,7 +1196,7 @@ static void spit_data_imports_data_import_source_instance_init (SpitDataImportsD
self->priv->preview_md5 = NULL;
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
self->ref_count = 1;
-#line 1357 "DataImportSource.c"
+#line 1200 "DataImportSource.c"
}
@@ -1371,7 +1214,7 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm
_g_free0 (self->priv->preview_md5);
#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
_metadata_date_time_unref0 (self->priv->exposure_time);
-#line 1375 "DataImportSource.c"
+#line 1218 "DataImportSource.c"
}
@@ -1404,7 +1247,7 @@ gpointer spit_data_imports_data_import_source_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
return instance;
-#line 1408 "DataImportSource.c"
+#line 1251 "DataImportSource.c"
}
@@ -1417,7 +1260,7 @@ void spit_data_imports_data_import_source_unref (gpointer instance) {
SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_GET_CLASS (self)->finalize (self);
#line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1421 "DataImportSource.c"
+#line 1264 "DataImportSource.c"
}
}
diff --git a/src/data_imports/DataImportSource.vala b/src/data_imports/DataImportSource.vala
index 9d16761..ba00be3 100644
--- a/src/data_imports/DataImportSource.vala
+++ b/src/data_imports/DataImportSource.vala
@@ -58,15 +58,11 @@ public class DataImportSource {
} else {
exposure_time = (metadata != null) ? metadata.get_exposure_date_time() : null;
}
- PhotoPreview? preview = metadata != null ? metadata.get_preview(0) : null;
- if (preview != null) {
- try {
- uint8[] preview_raw = preview.flatten();
- preview_md5 = md5_binary(preview_raw, preview_raw.length);
- } catch(Error e) {
- warning("Could not get raw preview for %s: %s", get_filename(), e.message);
- }
+
+ if (metadata != null) {
+ preview_md5 = metadata.thumbnail_hash();
}
+
#if TRACE_MD5
debug("Photo MD5 %s: preview=%s", get_filename(), preview_md5);
#endif
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index 34a114f..47b2e0a 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -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_add71 (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_add71 (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"
@@ -76,7 +76,7 @@ void data_imports_init (GError** error) {
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
_tmp2_ = g_strdup ("org.yorba.shotwell.dataimports.fspot");
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
- _vala_array_add68 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
+ _vala_array_add71 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
#line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
_tmp3_ = core_ids;
#line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 0c9913d..d07da46 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -442,6 +442,7 @@ struct _ImportManifest {
GeeList* already_imported;
GeeList* corrupt_files;
GeeList* all;
+ GTimer* timer;
};
struct _ImportManifestClass {
@@ -604,7 +605,7 @@ static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj)
enum {
SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_DUMMY_PROPERTY
};
-static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImportableLibrary** self, int length);
+static SpitDataImportsImportableLibrary** _vala_array_dup21 (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);
@@ -623,10 +624,10 @@ 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 __lambda23_ (void* a, void* b);
+static void _vala_array_add72 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value);
+static gint __lambda25_ (void* a, void* b);
gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda23____compar_fn_t (void* key1, void* key2);
+static gint ___lambda25____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;
@@ -668,14 +669,14 @@ SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType ob
self->priv->host = _tmp0_;
#line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return self;
-#line 672 "DataImportsPluginHost.c"
+#line 673 "DataImportsPluginHost.c"
}
SpitDataImportsCoreImporter* spit_data_imports_core_importer_new (SpitDataImportsPluginHost* host) {
#line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return spit_data_imports_core_importer_construct (SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, host);
-#line 679 "DataImportsPluginHost.c"
+#line 680 "DataImportsPluginHost.c"
}
@@ -684,21 +685,21 @@ static gint64 _spit_data_imports_import_job_comparator_comparator (void* a, void
result = spit_data_imports_import_job_comparator (a, b);
#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 688 "DataImportsPluginHost.c"
+#line 689 "DataImportsPluginHost.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return self ? g_object_ref (self) : NULL;
-#line 695 "DataImportsPluginHost.c"
+#line 696 "DataImportsPluginHost.c"
}
static void _spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
#line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
spit_data_imports_data_import_reporter (manifest, import_roll);
-#line 702 "DataImportsPluginHost.c"
+#line 703 "DataImportsPluginHost.c"
}
@@ -761,7 +762,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_tmp8_ = items;
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp8__length1 = items_length1;
-#line 765 "DataImportsPluginHost.c"
+#line 766 "DataImportsPluginHost.c"
{
SpitDataImportsImportableMediaItem** src_item_collection = NULL;
gint src_item_collection_length1 = 0;
@@ -773,14 +774,14 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
src_item_collection_length1 = _tmp8__length1;
#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"
+#line 778 "DataImportsPluginHost.c"
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]);
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
src_item = _tmp9_;
-#line 784 "DataImportsPluginHost.c"
+#line 785 "DataImportsPluginHost.c"
{
SpitDataImportsDataImportSource* import_source = NULL;
SpitDataImportsImportableMediaItem* _tmp10_;
@@ -810,7 +811,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_tmp13_ = spit_data_imports_data_import_source_was_backing_file_found (_tmp12_);
#line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (!_tmp13_) {
-#line 814 "DataImportsPluginHost.c"
+#line 815 "DataImportsPluginHost.c"
SpitDataImportsDataImportSource* _tmp14_;
gchar* _tmp15_;
gchar* _tmp16_;
@@ -847,7 +848,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_g_object_unref0 (src_item);
#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
continue;
-#line 850 "DataImportsPluginHost.c"
+#line 851 "DataImportsPluginHost.c"
}
#line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp21_ = import_source;
@@ -855,7 +856,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_tmp22_ = spit_data_imports_data_import_source_is_already_imported (_tmp21_);
#line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp22_) {
-#line 858 "DataImportsPluginHost.c"
+#line 859 "DataImportsPluginHost.c"
SpitDataImportsDataImportSource* _tmp23_;
gchar* _tmp24_;
gchar* _tmp25_;
@@ -892,7 +893,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_g_object_unref0 (src_item);
#line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
continue;
-#line 894 "DataImportsPluginHost.c"
+#line 895 "DataImportsPluginHost.c"
}
#line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp30_ = jobs;
@@ -924,7 +925,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_spit_data_imports_data_import_source_unref0 (import_source);
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (src_item);
-#line 926 "DataImportsPluginHost.c"
+#line 927 "DataImportsPluginHost.c"
}
}
}
@@ -936,7 +937,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_tmp41_ = _tmp40_;
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp41_ > 0) {
-#line 938 "DataImportsPluginHost.c"
+#line 939 "DataImportsPluginHost.c"
BatchImportRoll* _tmp42_;
gchar* db_name = NULL;
SpitDataImportsPluginHost* _tmp44_;
@@ -965,7 +966,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_tmp42_ = self->current_import_roll;
#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp42_ == NULL) {
-#line 967 "DataImportsPluginHost.c"
+#line 968 "DataImportsPluginHost.c"
BatchImportRoll* _tmp43_;
#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp43_ = batch_import_roll_new ();
@@ -973,7 +974,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_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 975 "DataImportsPluginHost.c"
+#line 976 "DataImportsPluginHost.c"
}
#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp44_ = self->priv->host;
@@ -1035,7 +1036,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_g_object_unref0 (batch_import);
#line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_free0 (db_name);
-#line 1037 "DataImportsPluginHost.c"
+#line 1038 "DataImportsPluginHost.c"
}
#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp65_ = self->priv->host;
@@ -1051,7 +1052,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
_g_object_unref0 (already_imported);
#line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (jobs);
-#line 1053 "DataImportsPluginHost.c"
+#line 1054 "DataImportsPluginHost.c"
}
@@ -1127,14 +1128,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 1129 "DataImportsPluginHost.c"
+#line 1130 "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 1136 "DataImportsPluginHost.c"
+#line 1137 "DataImportsPluginHost.c"
}
@@ -1143,7 +1144,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 1145 "DataImportsPluginHost.c"
+#line 1146 "DataImportsPluginHost.c"
}
}
@@ -1153,11 +1154,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 1155 "DataImportsPluginHost.c"
+#line 1156 "DataImportsPluginHost.c"
} else {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1159 "DataImportsPluginHost.c"
+#line 1160 "DataImportsPluginHost.c"
}
}
@@ -1165,37 +1166,37 @@ 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 1167 "DataImportsPluginHost.c"
+#line 1168 "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 1174 "DataImportsPluginHost.c"
+#line 1175 "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 1181 "DataImportsPluginHost.c"
+#line 1182 "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 1185 "DataImportsPluginHost.c"
+#line 1186 "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 1189 "DataImportsPluginHost.c"
+#line 1190 "DataImportsPluginHost.c"
} else {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
value->data[0].v_pointer = NULL;
-#line 1193 "DataImportsPluginHost.c"
+#line 1194 "DataImportsPluginHost.c"
}
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return NULL;
-#line 1197 "DataImportsPluginHost.c"
+#line 1198 "DataImportsPluginHost.c"
}
@@ -1206,25 +1207,25 @@ static gchar* spit_data_imports_value_core_importer_lcopy_value (const GValue* v
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 1208 "DataImportsPluginHost.c"
+#line 1209 "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 1214 "DataImportsPluginHost.c"
+#line 1215 "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 1218 "DataImportsPluginHost.c"
+#line 1219 "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 1222 "DataImportsPluginHost.c"
+#line 1223 "DataImportsPluginHost.c"
}
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return NULL;
-#line 1226 "DataImportsPluginHost.c"
+#line 1227 "DataImportsPluginHost.c"
}
@@ -1238,7 +1239,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 1240 "DataImportsPluginHost.c"
+#line 1241 "DataImportsPluginHost.c"
}
@@ -1247,7 +1248,7 @@ 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 1249 "DataImportsPluginHost.c"
+#line 1250 "DataImportsPluginHost.c"
}
@@ -1267,17 +1268,17 @@ 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 1269 "DataImportsPluginHost.c"
+#line 1270 "DataImportsPluginHost.c"
} else {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
value->data[0].v_pointer = NULL;
-#line 1273 "DataImportsPluginHost.c"
+#line 1274 "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 1279 "DataImportsPluginHost.c"
+#line 1280 "DataImportsPluginHost.c"
}
}
@@ -1296,17 +1297,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 1298 "DataImportsPluginHost.c"
+#line 1299 "DataImportsPluginHost.c"
} else {
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
value->data[0].v_pointer = NULL;
-#line 1302 "DataImportsPluginHost.c"
+#line 1303 "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 1308 "DataImportsPluginHost.c"
+#line 1309 "DataImportsPluginHost.c"
}
}
@@ -1318,7 +1319,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 1320 "DataImportsPluginHost.c"
+#line 1321 "DataImportsPluginHost.c"
}
@@ -1331,7 +1332,7 @@ 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 1333 "DataImportsPluginHost.c"
+#line 1334 "DataImportsPluginHost.c"
}
@@ -1343,7 +1344,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 1345 "DataImportsPluginHost.c"
+#line 1346 "DataImportsPluginHost.c"
}
@@ -1368,7 +1369,7 @@ gpointer spit_data_imports_core_importer_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return instance;
-#line 1370 "DataImportsPluginHost.c"
+#line 1371 "DataImportsPluginHost.c"
}
@@ -1381,7 +1382,7 @@ 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 1383 "DataImportsPluginHost.c"
+#line 1384 "DataImportsPluginHost.c"
}
}
@@ -1421,14 +1422,14 @@ 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 1423 "DataImportsPluginHost.c"
+#line 1424 "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 1430 "DataImportsPluginHost.c"
+#line 1431 "DataImportsPluginHost.c"
}
@@ -1447,7 +1448,7 @@ 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 1449 "DataImportsPluginHost.c"
+#line 1450 "DataImportsPluginHost.c"
}
@@ -1475,7 +1476,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 1477 "DataImportsPluginHost.c"
+#line 1478 "DataImportsPluginHost.c"
}
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_debug ("DataImportsPluginHost.vala:112: ConcreteDataImportsHost.start_importin" \
@@ -1488,7 +1489,7 @@ 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 1489 "DataImportsPluginHost.c"
+#line 1490 "DataImportsPluginHost.c"
}
@@ -1515,7 +1516,7 @@ 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 1515 "DataImportsPluginHost.c"
+#line 1516 "DataImportsPluginHost.c"
SpitDataImportsDataImporter* _tmp4_;
SpitDataImportsDataImporter* _tmp5_;
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1526,13 +1527,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 1526 "DataImportsPluginHost.c"
+#line 1527 "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 1532 "DataImportsPluginHost.c"
+#line 1533 "DataImportsPluginHost.c"
}
@@ -1543,7 +1544,7 @@ 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 1543 "DataImportsPluginHost.c"
+#line 1544 "DataImportsPluginHost.c"
}
@@ -1555,31 +1556,31 @@ void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImpor
_tmp0_ = mode;
#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp0_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
-#line 1555 "DataImportsPluginHost.c"
+#line 1556 "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 1561 "DataImportsPluginHost.c"
+#line 1562 "DataImportsPluginHost.c"
} else {
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 1568 "DataImportsPluginHost.c"
+#line 1569 "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 1574 "DataImportsPluginHost.c"
+#line 1575 "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 1578 "DataImportsPluginHost.c"
+#line 1579 "DataImportsPluginHost.c"
}
}
}
@@ -1597,7 +1598,7 @@ 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 1596 "DataImportsPluginHost.c"
+#line 1597 "DataImportsPluginHost.c"
}
@@ -1701,7 +1702,7 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error_message
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 1700 "DataImportsPluginHost.c"
+#line 1701 "DataImportsPluginHost.c"
}
@@ -1733,7 +1734,7 @@ 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 1731 "DataImportsPluginHost.c"
+#line 1732 "DataImportsPluginHost.c"
} else {
SpitDataImportsDataImporter* _tmp4_;
SpitDataImportsDataImporter* _tmp5_;
@@ -1748,13 +1749,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 1746 "DataImportsPluginHost.c"
+#line 1747 "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 1752 "DataImportsPluginHost.c"
+#line 1753 "DataImportsPluginHost.c"
}
#line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp7_ = self->priv->dialog;
@@ -1766,7 +1767,7 @@ 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 1764 "DataImportsPluginHost.c"
+#line 1765 "DataImportsPluginHost.c"
}
@@ -1797,7 +1798,7 @@ 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 1795 "DataImportsPluginHost.c"
+#line 1796 "DataImportsPluginHost.c"
}
@@ -1816,23 +1817,23 @@ 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 1814 "DataImportsPluginHost.c"
+#line 1815 "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 1820 "DataImportsPluginHost.c"
+#line 1821 "DataImportsPluginHost.c"
} else {
#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0_ = FALSE;
-#line 1824 "DataImportsPluginHost.c"
+#line 1825 "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 1830 "DataImportsPluginHost.c"
+#line 1831 "DataImportsPluginHost.c"
} else {
DataImportsUIDataImportsDialog* _tmp3_;
const gchar* _tmp4_;
@@ -1859,11 +1860,11 @@ 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 1857 "DataImportsPluginHost.c"
+#line 1858 "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 1861 "DataImportsPluginHost.c"
+#line 1862 "DataImportsPluginHost.c"
}
@@ -1905,7 +1906,7 @@ 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 1903 "DataImportsPluginHost.c"
+#line 1904 "DataImportsPluginHost.c"
}
@@ -1918,7 +1919,7 @@ static void spit_data_imports_concrete_data_imports_host_real_update_import_prog
_tmp0_ = self->priv->progress_pane;
#line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
if (_tmp0_ != NULL) {
-#line 1916 "DataImportsPluginHost.c"
+#line 1917 "DataImportsPluginHost.c"
DataImportsUIProgressPane* _tmp1_;
gdouble _tmp2_;
const gchar* _tmp3_;
@@ -1930,7 +1931,7 @@ 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 1928 "DataImportsPluginHost.c"
+#line 1929 "DataImportsPluginHost.c"
}
}
@@ -1959,7 +1960,7 @@ 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 1957 "DataImportsPluginHost.c"
+#line 1958 "DataImportsPluginHost.c"
}
@@ -2001,7 +2002,7 @@ 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 1999 "DataImportsPluginHost.c"
+#line 2000 "DataImportsPluginHost.c"
LibraryWindow* _tmp7_;
LibraryWindow* _tmp8_;
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2012,7 +2013,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 2010 "DataImportsPluginHost.c"
+#line 2011 "DataImportsPluginHost.c"
}
}
@@ -2024,7 +2025,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 2022 "DataImportsPluginHost.c"
+#line 2023 "DataImportsPluginHost.c"
}
@@ -2055,7 +2056,7 @@ static void spit_data_imports_concrete_data_imports_host_spit_data_imports_plugi
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 2053 "DataImportsPluginHost.c"
+#line 2054 "DataImportsPluginHost.c"
}
@@ -2070,7 +2071,7 @@ 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 2068 "DataImportsPluginHost.c"
+#line 2069 "DataImportsPluginHost.c"
}
@@ -2086,7 +2087,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 2084 "DataImportsPluginHost.c"
+#line 2085 "DataImportsPluginHost.c"
}
@@ -2139,14 +2140,14 @@ 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 2137 "DataImportsPluginHost.c"
+#line 2138 "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 2144 "DataImportsPluginHost.c"
+#line 2145 "DataImportsPluginHost.c"
}
@@ -2165,7 +2166,7 @@ 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 2163 "DataImportsPluginHost.c"
+#line 2164 "DataImportsPluginHost.c"
}
@@ -2193,7 +2194,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 2191 "DataImportsPluginHost.c"
+#line 2192 "DataImportsPluginHost.c"
}
#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
g_debug ("DataImportsPluginHost.vala:268: WelcomeDataImportsHost.start_importing" \
@@ -2206,7 +2207,7 @@ 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 2203 "DataImportsPluginHost.c"
+#line 2204 "DataImportsPluginHost.c"
}
@@ -2233,7 +2234,7 @@ 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 2229 "DataImportsPluginHost.c"
+#line 2230 "DataImportsPluginHost.c"
SpitDataImportsDataImporter* _tmp4_;
SpitDataImportsDataImporter* _tmp5_;
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2244,20 +2245,20 @@ 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 2240 "DataImportsPluginHost.c"
+#line 2241 "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 2246 "DataImportsPluginHost.c"
+#line 2247 "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 2253 "DataImportsPluginHost.c"
+#line 2254 "DataImportsPluginHost.c"
}
@@ -2273,7 +2274,7 @@ 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 2269 "DataImportsPluginHost.c"
+#line 2270 "DataImportsPluginHost.c"
}
@@ -2322,7 +2323,7 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error_message
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 2318 "DataImportsPluginHost.c"
+#line 2319 "DataImportsPluginHost.c"
}
@@ -2332,7 +2333,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 2328 "DataImportsPluginHost.c"
+#line 2329 "DataImportsPluginHost.c"
}
@@ -2342,7 +2343,7 @@ 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 2338 "DataImportsPluginHost.c"
+#line 2339 "DataImportsPluginHost.c"
}
@@ -2389,7 +2390,7 @@ 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 2385 "DataImportsPluginHost.c"
+#line 2386 "DataImportsPluginHost.c"
SpitDataImportsWelcomeImportMetaHost* _tmp8_;
SpitDataImportsDataImporter* _tmp9_;
SpitDataImportsDataImporter* _tmp10_;
@@ -2428,7 +2429,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 2424 "DataImportsPluginHost.c"
+#line 2425 "DataImportsPluginHost.c"
}
}
@@ -2439,7 +2440,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 2435 "DataImportsPluginHost.c"
+#line 2436 "DataImportsPluginHost.c"
}
@@ -2447,7 +2448,7 @@ 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 2443 "DataImportsPluginHost.c"
+#line 2444 "DataImportsPluginHost.c"
}
@@ -2475,7 +2476,7 @@ 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 2471 "DataImportsPluginHost.c"
+#line 2472 "DataImportsPluginHost.c"
}
@@ -2507,7 +2508,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 2503 "DataImportsPluginHost.c"
+#line 2504 "DataImportsPluginHost.c"
}
@@ -2518,7 +2519,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 2514 "DataImportsPluginHost.c"
+#line 2515 "DataImportsPluginHost.c"
}
@@ -2549,7 +2550,7 @@ static void spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin
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 2545 "DataImportsPluginHost.c"
+#line 2546 "DataImportsPluginHost.c"
}
@@ -2560,7 +2561,7 @@ 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 2556 "DataImportsPluginHost.c"
+#line 2557 "DataImportsPluginHost.c"
}
@@ -2574,7 +2575,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 2570 "DataImportsPluginHost.c"
+#line 2571 "DataImportsPluginHost.c"
}
@@ -2592,24 +2593,24 @@ GType spit_data_imports_welcome_data_imports_host_get_type (void) {
}
-static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImportableLibrary** self, int length) {
+static SpitDataImportsImportableLibrary** _vala_array_dup21 (SpitDataImportsImportableLibrary** self, int length) {
SpitDataImportsImportableLibrary** result;
int i;
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
result = g_new0 (SpitDataImportsImportableLibrary*, length + 1);
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
for (i = 0; i < length; i++) {
-#line 2595 "DataImportsPluginHost.c"
+#line 2596 "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 2601 "DataImportsPluginHost.c"
+#line 2602 "DataImportsPluginHost.c"
}
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 2605 "DataImportsPluginHost.c"
+#line 2606 "DataImportsPluginHost.c"
}
@@ -2650,7 +2651,7 @@ SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_servi
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp4__length1 = discovered_libraries_length1;
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup25 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
+ _tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup21 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp5__length1 = _tmp4__length1;
#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2663,14 +2664,14 @@ 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 2659 "DataImportsPluginHost.c"
+#line 2660 "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 2666 "DataImportsPluginHost.c"
+#line 2667 "DataImportsPluginHost.c"
}
@@ -2689,7 +2690,7 @@ 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 2685 "DataImportsPluginHost.c"
+#line 2686 "DataImportsPluginHost.c"
}
@@ -2703,7 +2704,7 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
_tmp0_ = self->priv->discovered_libraries;
#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp0__length1 = self->priv->discovered_libraries_length1;
-#line 2699 "DataImportsPluginHost.c"
+#line 2700 "DataImportsPluginHost.c"
{
SpitDataImportsImportableLibrary** library_collection = NULL;
gint library_collection_length1 = 0;
@@ -2715,14 +2716,14 @@ 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 2711 "DataImportsPluginHost.c"
+#line 2712 "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 2718 "DataImportsPluginHost.c"
+#line 2719 "DataImportsPluginHost.c"
{
SpitDataImportsPluginHost* _tmp2_;
SpitDataImportsDataImporter* _tmp3_;
@@ -2742,7 +2743,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 2738 "DataImportsPluginHost.c"
+#line 2739 "DataImportsPluginHost.c"
}
}
}
@@ -2756,7 +2757,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 2752 "DataImportsPluginHost.c"
+#line 2753 "DataImportsPluginHost.c"
}
@@ -2767,14 +2768,14 @@ static void spit_data_imports_welcome_import_service_entry_welcome_service_entry
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 2763 "DataImportsPluginHost.c"
+#line 2764 "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 2770 "DataImportsPluginHost.c"
+#line 2771 "DataImportsPluginHost.c"
}
@@ -2790,7 +2791,7 @@ static void spit_data_imports_welcome_import_service_entry_finalize (GObject * o
_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 2786 "DataImportsPluginHost.c"
+#line 2787 "DataImportsPluginHost.c"
}
@@ -2826,14 +2827,14 @@ 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 2822 "DataImportsPluginHost.c"
+#line 2823 "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 2829 "DataImportsPluginHost.c"
+#line 2830 "DataImportsPluginHost.c"
}
@@ -2859,7 +2860,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 2855 "DataImportsPluginHost.c"
+#line 2856 "DataImportsPluginHost.c"
{
SpitDataImportsService** service_collection = NULL;
gint service_collection_length1 = 0;
@@ -2871,14 +2872,14 @@ 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 2867 "DataImportsPluginHost.c"
+#line 2868 "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 2874 "DataImportsPluginHost.c"
+#line 2875 "DataImportsPluginHost.c"
{
SpitDataImportsWelcomeDataImportsHost* host = NULL;
SpitDataImportsService* _tmp4_;
@@ -2898,13 +2899,13 @@ 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 2894 "DataImportsPluginHost.c"
+#line 2895 "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 2900 "DataImportsPluginHost.c"
+#line 2901 "DataImportsPluginHost.c"
}
@@ -2918,7 +2919,7 @@ 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 2914 "DataImportsPluginHost.c"
+#line 2915 "DataImportsPluginHost.c"
}
@@ -2956,7 +2957,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 2952 "DataImportsPluginHost.c"
+#line 2953 "DataImportsPluginHost.c"
}
@@ -2967,14 +2968,14 @@ 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 2963 "DataImportsPluginHost.c"
+#line 2964 "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 2970 "DataImportsPluginHost.c"
+#line 2971 "DataImportsPluginHost.c"
}
@@ -2986,7 +2987,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 2982 "DataImportsPluginHost.c"
+#line 2983 "DataImportsPluginHost.c"
}
@@ -3018,34 +3019,34 @@ 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 3014 "DataImportsPluginHost.c"
+#line 3015 "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 3020 "DataImportsPluginHost.c"
+#line 3021 "DataImportsPluginHost.c"
}
-static void _vala_array_add69 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value) {
+static void _vala_array_add72 (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 3031 "DataImportsPluginHost.c"
+#line 3032 "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 3037 "DataImportsPluginHost.c"
+#line 3038 "DataImportsPluginHost.c"
}
-static gint __lambda23_ (void* a, void* b) {
+static gint __lambda25_ (void* a, void* b) {
gint result = 0;
void* _tmp0_;
const gchar* _tmp1_;
@@ -3066,16 +3067,16 @@ static gint __lambda23_ (void* a, void* b) {
result = _tmp4_;
#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 3062 "DataImportsPluginHost.c"
+#line 3063 "DataImportsPluginHost.c"
}
-static gint ___lambda23____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda25____compar_fn_t (void* key1, void* key2) {
gint result;
- result = __lambda23_ (key1, key2);
+ result = __lambda25_ (key1, key2);
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
-#line 3071 "DataImportsPluginHost.c"
+#line 3072 "DataImportsPluginHost.c"
}
@@ -3120,7 +3121,7 @@ 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 3115 "DataImportsPluginHost.c"
+#line 3116 "DataImportsPluginHost.c"
{
GeeIterator* _pluggable_it = NULL;
GeeCollection* _tmp6_;
@@ -3133,7 +3134,7 @@ 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 3128 "DataImportsPluginHost.c"
+#line 3129 "DataImportsPluginHost.c"
GeeIterator* _tmp8_;
gboolean _tmp9_;
SpitPluggable* pluggable = NULL;
@@ -3160,7 +3161,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 3155 "DataImportsPluginHost.c"
+#line 3156 "DataImportsPluginHost.c"
}
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp10_ = _pluggable_it;
@@ -3178,7 +3179,7 @@ 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 3173 "DataImportsPluginHost.c"
+#line 3174 "DataImportsPluginHost.c"
SpitPluggable* _tmp15_;
gchar* _tmp16_;
gchar* _tmp17_;
@@ -3200,7 +3201,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 3194 "DataImportsPluginHost.c"
+#line 3195 "DataImportsPluginHost.c"
}
#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp19_ = pluggable;
@@ -3224,16 +3225,16 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp25_ = _g_object_ref0 (_tmp24_);
#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- _vala_array_add69 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp25_);
+ _vala_array_add72 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp25_);
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (service);
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (pluggable);
-#line 3222 "DataImportsPluginHost.c"
+#line 3223 "DataImportsPluginHost.c"
}
#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_pluggable_it);
-#line 3226 "DataImportsPluginHost.c"
+#line 3227 "DataImportsPluginHost.c"
}
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp26_ = loaded_services;
@@ -3244,7 +3245,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*), ___lambda23____compar_fn_t);
+ qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda25____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"
@@ -3253,7 +3254,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 3246 "DataImportsPluginHost.c"
+#line 3247 "DataImportsPluginHost.c"
}
#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
result = _tmp28_;
@@ -3261,7 +3262,7 @@ 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 3254 "DataImportsPluginHost.c"
+#line 3255 "DataImportsPluginHost.c"
}
@@ -3284,13 +3285,13 @@ 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 3277 "DataImportsPluginHost.c"
+#line 3278 "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 3283 "DataImportsPluginHost.c"
+#line 3284 "DataImportsPluginHost.c"
ImportManifest* _tmp5_;
#line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp5_ = import_manifest_new (NULL, NULL);
@@ -3298,7 +3299,7 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
_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 3291 "DataImportsPluginHost.c"
+#line 3292 "DataImportsPluginHost.c"
}
{
GeeList* _result_list = NULL;
@@ -3330,7 +3331,7 @@ 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 3323 "DataImportsPluginHost.c"
+#line 3324 "DataImportsPluginHost.c"
gint _tmp12_;
gint _tmp13_;
gint _tmp14_;
@@ -3352,7 +3353,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 3345 "DataImportsPluginHost.c"
+#line 3346 "DataImportsPluginHost.c"
}
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp15_ = _result_list;
@@ -3370,11 +3371,11 @@ 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 3363 "DataImportsPluginHost.c"
+#line 3364 "DataImportsPluginHost.c"
}
#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_g_object_unref0 (_result_list);
-#line 3367 "DataImportsPluginHost.c"
+#line 3368 "DataImportsPluginHost.c"
}
} else {
ImportManifest* _tmp20_;
@@ -3388,7 +3389,7 @@ 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 3381 "DataImportsPluginHost.c"
+#line 3382 "DataImportsPluginHost.c"
}
}
@@ -3411,7 +3412,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 3404 "DataImportsPluginHost.c"
+#line 3405 "DataImportsPluginHost.c"
}
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index 28039a9..b350abf 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -253,16 +253,16 @@ 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 ___lambda21_ (Block11Data* _data11_);
+static void ___lambda23_ (Block11Data* _data11_);
static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self);
-static void ____lambda21__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
-static void __lambda22_ (DataImportsUILibrarySelectionPane* self);
+static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
+static void __lambda24_ (DataImportsUILibrarySelectionPane* self);
static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library);
-static void ___lambda22__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void ___lambda24__gtk_button_clicked (GtkButton* _sender, gpointer self);
static Block12Data* block12_data_ref (Block12Data* _data12_);
static void block12_data_unref (void * _userdata_);
-static void __lambda20_ (Block12Data* _data12_);
-static void ___lambda20__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void __lambda22_ (Block12Data* _data12_);
+static void ___lambda22__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))
@@ -293,6 +293,7 @@ enum {
#define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_ACTION_BUTTON_WIDTH 128
DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void);
DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type);
+gint resources_use_header_bar (void);
static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt);
static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1);
@@ -342,21 +343,21 @@ DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct
self->priv->pane_widget = _tmp0_;
#line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return self;
-#line 342 "DataImportsUI.c"
+#line 343 "DataImportsUI.c"
}
DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_new (void) {
#line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return data_imports_ui_concrete_dialog_pane_construct (DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE);
-#line 349 "DataImportsUI.c"
+#line 350 "DataImportsUI.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return self ? g_object_ref (self) : NULL;
-#line 356 "DataImportsUI.c"
+#line 357 "DataImportsUI.c"
}
@@ -375,7 +376,7 @@ static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitData
result = _tmp1_;
#line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 375 "DataImportsUI.c"
+#line 376 "DataImportsUI.c"
}
@@ -388,7 +389,7 @@ static SpitDataImportsDialogPaneGeometryOptions data_imports_ui_concrete_dialog_
result = SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 388 "DataImportsUI.c"
+#line 389 "DataImportsUI.c"
}
@@ -396,7 +397,7 @@ static void data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDat
DataImportsUIConcreteDialogPane * self;
#line 27 "/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 396 "DataImportsUI.c"
+#line 397 "DataImportsUI.c"
}
@@ -404,7 +405,7 @@ static void data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitD
DataImportsUIConcreteDialogPane * self;
#line 30 "/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 404 "DataImportsUI.c"
+#line 405 "DataImportsUI.c"
}
@@ -415,7 +416,7 @@ static void data_imports_ui_concrete_dialog_pane_class_init (DataImportsUIConcre
g_type_class_add_private (klass, sizeof (DataImportsUIConcreteDialogPanePrivate));
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (klass)->finalize = data_imports_ui_concrete_dialog_pane_finalize;
-#line 415 "DataImportsUI.c"
+#line 416 "DataImportsUI.c"
}
@@ -430,14 +431,14 @@ static void data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_i
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;
-#line 430 "DataImportsUI.c"
+#line 431 "DataImportsUI.c"
}
static void data_imports_ui_concrete_dialog_pane_instance_init (DataImportsUIConcreteDialogPane * self) {
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv = DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_GET_PRIVATE (self);
-#line 437 "DataImportsUI.c"
+#line 438 "DataImportsUI.c"
}
@@ -449,7 +450,7 @@ static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->pane_widget);
#line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (data_imports_ui_concrete_dialog_pane_parent_class)->finalize (obj);
-#line 449 "DataImportsUI.c"
+#line 450 "DataImportsUI.c"
}
@@ -495,7 +496,7 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (G
if (_tmp3_ == NULL) {
#line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp2_);
-#line 495 "DataImportsUI.c"
+#line 496 "DataImportsUI.c"
}
#line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4_ = _tmp3_;
@@ -507,14 +508,14 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (G
_g_object_unref0 (message_label);
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return self;
-#line 507 "DataImportsUI.c"
+#line 508 "DataImportsUI.c"
}
DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new (const gchar* message_string) {
#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return data_imports_ui_static_message_pane_construct (DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE, message_string);
-#line 514 "DataImportsUI.c"
+#line 515 "DataImportsUI.c"
}
@@ -550,7 +551,7 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_wi
if (_tmp3_ == NULL) {
#line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp2_);
-#line 550 "DataImportsUI.c"
+#line 551 "DataImportsUI.c"
}
#line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4_ = _tmp3_;
@@ -562,21 +563,21 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_wi
_g_object_unref0 (label);
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return self;
-#line 562 "DataImportsUI.c"
+#line 563 "DataImportsUI.c"
}
DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new_with_pango (const gchar* msg) {
#line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return data_imports_ui_static_message_pane_construct_with_pango (DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE, msg);
-#line 569 "DataImportsUI.c"
+#line 570 "DataImportsUI.c"
}
static void data_imports_ui_static_message_pane_class_init (DataImportsUIStaticMessagePaneClass * klass) {
#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_static_message_pane_parent_class = g_type_class_peek_parent (klass);
-#line 576 "DataImportsUI.c"
+#line 577 "DataImportsUI.c"
}
@@ -601,7 +602,7 @@ static Block11Data* block11_data_ref (Block11Data* _data11_) {
g_atomic_int_inc (&_data11_->_ref_count_);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return _data11_;
-#line 601 "DataImportsUI.c"
+#line 602 "DataImportsUI.c"
}
@@ -610,7 +611,7 @@ static void block11_data_unref (void * _userdata_) {
_data11_ = (Block11Data*) _userdata_;
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) {
-#line 610 "DataImportsUI.c"
+#line 611 "DataImportsUI.c"
DataImportsUILibrarySelectionPane* self;
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = _data11_->self;
@@ -620,12 +621,12 @@ static void block11_data_unref (void * _userdata_) {
_g_object_unref0 (self);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_slice_free (Block11Data, _data11_);
-#line 620 "DataImportsUI.c"
+#line 621 "DataImportsUI.c"
}
}
-static void ___lambda21_ (Block11Data* _data11_) {
+static void ___lambda23_ (Block11Data* _data11_) {
DataImportsUILibrarySelectionPane* self;
GtkFileChooserButton* _tmp0_;
GFile* _tmp1_;
@@ -644,67 +645,67 @@ static void ___lambda21_ (Block11Data* _data11_) {
_tmp2_ = self->priv->file_radio;
#line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp2_ != NULL) {
-#line 644 "DataImportsUI.c"
+#line 645 "DataImportsUI.c"
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"
gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 650 "DataImportsUI.c"
+#line 651 "DataImportsUI.c"
}
#line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
-#line 654 "DataImportsUI.c"
+#line 655 "DataImportsUI.c"
}
-static void ____lambda21__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
+static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- ___lambda21_ (self);
-#line 661 "DataImportsUI.c"
+ ___lambda23_ (self);
+#line 662 "DataImportsUI.c"
}
-static void __lambda22_ (DataImportsUILibrarySelectionPane* self) {
+static void __lambda24_ (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"
+#line 672 "DataImportsUI.c"
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"
+#line 678 "DataImportsUI.c"
} else {
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"
+#line 685 "DataImportsUI.c"
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"
data_imports_ui_library_selection_pane_on_file_selected (self, _tmp3_);
-#line 690 "DataImportsUI.c"
+#line 691 "DataImportsUI.c"
} else {
#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_debug ("DataImportsUI.vala:119: LibrarySelectionPane: Library or file should b" \
"e selected.");
-#line 694 "DataImportsUI.c"
+#line 695 "DataImportsUI.c"
}
}
}
-static void ___lambda22__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void ___lambda24__gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- __lambda22_ ((DataImportsUILibrarySelectionPane*) self);
-#line 703 "DataImportsUI.c"
+ __lambda24_ ((DataImportsUILibrarySelectionPane*) self);
+#line 704 "DataImportsUI.c"
}
@@ -760,11 +761,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 759 "DataImportsUI.c"
+#line 760 "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 763 "DataImportsUI.c"
+#line 764 "DataImportsUI.c"
}
#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_vala_assert (_tmp0_, "discovered_libraries.length > 0 || on_file_selected != null");
@@ -832,7 +833,7 @@ 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 831 "DataImportsUI.c"
+#line 832 "DataImportsUI.c"
gint _tmp16_;
SpitDataImportsImportableLibrary** _tmp17_;
gint _tmp17__length1;
@@ -845,7 +846,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 844 "DataImportsUI.c"
+#line 845 "DataImportsUI.c"
{
SpitDataImportsImportableLibrary** library_collection = NULL;
gint library_collection_length1 = 0;
@@ -857,14 +858,14 @@ 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 856 "DataImportsUI.c"
+#line 857 "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 863 "DataImportsUI.c"
+#line 864 "DataImportsUI.c"
{
gchar* lib_radio_label = NULL;
SpitDataImportsImportableLibrary* _tmp19_;
@@ -904,7 +905,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 903 "DataImportsUI.c"
+#line 904 "DataImportsUI.c"
}
}
}
@@ -912,7 +913,7 @@ 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 911 "DataImportsUI.c"
+#line 912 "DataImportsUI.c"
GtkBox* _tmp29_;
GtkRadioButton* _tmp30_;
const gchar* _tmp31_;
@@ -945,14 +946,14 @@ 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 944 "DataImportsUI.c"
+#line 945 "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 951 "DataImportsUI.c"
+#line 952 "DataImportsUI.c"
Block11Data* _data11_;
GtkFileChooserButton* _tmp38_;
GtkFileChooserButton* _tmp39_;
@@ -977,7 +978,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp39_ = _data11_->file_chooser;
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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);
+ g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda23__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"
_tmp40_ = _data11_->file_chooser;
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1000,7 +1001,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
block11_data_unref (_data11_);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_data11_ = NULL;
-#line 999 "DataImportsUI.c"
+#line 1000 "DataImportsUI.c"
}
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp46_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Import"));
@@ -1013,7 +1014,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp47_ = self->priv->import_button;
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_object (_tmp47_, "clicked", (GCallback) ___lambda22__gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp47_, "clicked", (GCallback) ___lambda24__gtk_button_clicked, self, 0);
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp48_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1038,7 +1039,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
if (_tmp52_ == NULL) {
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp51_);
-#line 1037 "DataImportsUI.c"
+#line 1038 "DataImportsUI.c"
}
#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp53_ = _tmp52_;
@@ -1060,14 +1061,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 1059 "DataImportsUI.c"
+#line 1060 "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 1066 "DataImportsUI.c"
+#line 1067 "DataImportsUI.c"
}
@@ -1076,7 +1077,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 1075 "DataImportsUI.c"
+#line 1076 "DataImportsUI.c"
}
@@ -1085,7 +1086,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 1084 "DataImportsUI.c"
+#line 1085 "DataImportsUI.c"
DataImportsUILibrarySelectionPane* self;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self = _data12_->self;
@@ -1097,12 +1098,12 @@ 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 1096 "DataImportsUI.c"
+#line 1097 "DataImportsUI.c"
}
}
-static void __lambda20_ (Block12Data* _data12_) {
+static void __lambda22_ (Block12Data* _data12_) {
DataImportsUILibrarySelectionPane* self;
GtkRadioButton* _tmp0_;
gboolean _tmp1_;
@@ -1117,7 +1118,7 @@ static void __lambda20_ (Block12Data* _data12_) {
_tmp2_ = _tmp1_;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp2_) {
-#line 1116 "DataImportsUI.c"
+#line 1117 "DataImportsUI.c"
SpitDataImportsImportableLibrary* _tmp3_;
SpitDataImportsImportableLibrary* _tmp4_;
#line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1130,15 +1131,15 @@ static void __lambda20_ (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 1129 "DataImportsUI.c"
+#line 1130 "DataImportsUI.c"
}
}
-static void ___lambda20__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void ___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- __lambda20_ (self);
-#line 1137 "DataImportsUI.c"
+ __lambda22_ (self);
+#line 1138 "DataImportsUI.c"
}
@@ -1198,7 +1199,7 @@ 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 1197 "DataImportsUI.c"
+#line 1198 "DataImportsUI.c"
GtkRadioButton* _tmp6_;
SpitDataImportsImportableLibrary* _tmp7_;
SpitDataImportsImportableLibrary* _tmp8_;
@@ -1214,12 +1215,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 1213 "DataImportsUI.c"
+#line 1214 "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) ___lambda20__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) ___lambda22__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"
@@ -1250,7 +1251,7 @@ 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 1249 "DataImportsUI.c"
+#line 1250 "DataImportsUI.c"
}
@@ -1266,20 +1267,20 @@ 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 1265 "DataImportsUI.c"
+#line 1266 "DataImportsUI.c"
} else {
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 1272 "DataImportsUI.c"
+#line 1273 "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 1278 "DataImportsUI.c"
+#line 1279 "DataImportsUI.c"
}
@@ -1304,7 +1305,7 @@ 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 1303 "DataImportsUI.c"
+#line 1304 "DataImportsUI.c"
}
@@ -1329,7 +1330,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 1328 "DataImportsUI.c"
+#line 1329 "DataImportsUI.c"
}
@@ -1340,7 +1341,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 1339 "DataImportsUI.c"
+#line 1340 "DataImportsUI.c"
}
@@ -1353,7 +1354,7 @@ 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 1352 "DataImportsUI.c"
+#line 1353 "DataImportsUI.c"
}
@@ -1371,7 +1372,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 1370 "DataImportsUI.c"
+#line 1371 "DataImportsUI.c"
}
@@ -1457,7 +1458,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 1456 "DataImportsUI.c"
+#line 1457 "DataImportsUI.c"
}
#line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp10_ = _tmp9_;
@@ -1469,14 +1470,14 @@ 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 1468 "DataImportsUI.c"
+#line 1469 "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 1475 "DataImportsUI.c"
+#line 1476 "DataImportsUI.c"
}
@@ -1496,7 +1497,7 @@ 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 1495 "DataImportsUI.c"
+#line 1496 "DataImportsUI.c"
GtkLabel* _tmp3_;
const gchar* _tmp4_;
#line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1505,11 +1506,11 @@ void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* s
_tmp4_ = progress_message;
#line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_label_set_label (_tmp3_, _tmp4_);
-#line 1504 "DataImportsUI.c"
+#line 1505 "DataImportsUI.c"
}
#line 187 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spin_event_loop ();
-#line 1508 "DataImportsUI.c"
+#line 1509 "DataImportsUI.c"
}
@@ -1520,14 +1521,14 @@ 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 1519 "DataImportsUI.c"
+#line 1520 "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 1526 "DataImportsUI.c"
+#line 1527 "DataImportsUI.c"
}
@@ -1543,7 +1544,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 1542 "DataImportsUI.c"
+#line 1543 "DataImportsUI.c"
}
@@ -1562,535 +1563,522 @@ GType data_imports_ui_progress_pane_get_type (void) {
static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
gboolean result;
result = data_imports_ui_data_imports_dialog_on_window_close ((DataImportsUIDataImportsDialog*) self, event);
-#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 1563 "DataImportsUI.c"
+#line 1564 "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"
+#line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_on_service_changed ((DataImportsUIDataImportsDialog*) self);
-#line 1570 "DataImportsUI.c"
+#line 1571 "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"
+#line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_on_close_cancel_clicked ((DataImportsUIDataImportsDialog*) self);
-#line 1577 "DataImportsUI.c"
+#line 1578 "DataImportsUI.c"
}
DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type) {
DataImportsUIDataImportsDialog * self = NULL;
gboolean use_header = FALSE;
- GtkSettings* _tmp0_;
- gint _tmp1_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
gchar* title = NULL;
- gchar* _tmp5_;
+ gchar* _tmp4_;
gchar* label = NULL;
- gchar* _tmp6_;
- const gchar* _tmp7_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
SpitDataImportsService** loaded_services = NULL;
- gint _tmp8_;
- SpitDataImportsService** _tmp9_;
+ gint _tmp7_;
+ SpitDataImportsService** _tmp8_;
gint loaded_services_length1;
gint _loaded_services_size_;
- SpitDataImportsService** _tmp10_;
- gint _tmp10__length1;
+ SpitDataImportsService** _tmp9_;
+ gint _tmp9__length1;
+ GtkBox* _tmp64_;
GtkBox* _tmp65_;
GtkBox* _tmp66_;
- GtkBox* _tmp67_;
- gboolean _tmp68_;
- GtkButton* _tmp78_;
- SpitDataImportsService** _tmp79_;
- gint _tmp79__length1;
+ gboolean _tmp67_;
+ GtkButton* _tmp77_;
+ SpitDataImportsService** _tmp78_;
+ gint _tmp78__length1;
#line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- use_header = FALSE;
+ _tmp0_ = resources_use_header_bar ();
+#line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ use_header = _tmp0_ == 1;
#line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp0_ = gtk_settings_get_default ();
+ _tmp1_ = resources_use_header_bar ();
#line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
+ self = (DataImportsUIDataImportsDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = use_header;
#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp2_) {
-#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp1_ = 1;
#line 1619 "DataImportsUI.c"
- } else {
-#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp1_ = 0;
-#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);
+ GtkWidget* _tmp3_;
#line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp3_ = use_header;
+ _tmp3_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp3_) {
-#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 1637 "DataImportsUI.c"
+ gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
+#line 1625 "DataImportsUI.c"
}
-#line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 216 "/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"
+#line 217 "/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 219 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp4_ = g_strdup (_ ("Import From Application"));
+#line 219 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ title = _tmp4_;
#line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp5_ = g_strdup (_ ("Import From Application"));
+ _tmp5_ = g_strdup (_ ("Import media _from:"));
#line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- title = _tmp5_;
-#line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp6_ = g_strdup (_ ("Import media _from:"));
-#line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- label = _tmp6_;
-#line 223 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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), _tmp7_);
-#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp9_ = spit_data_imports_load_services (FALSE, &_tmp8_);
-#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- loaded_services = _tmp9_;
-#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- loaded_services_length1 = _tmp8_;
-#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ label = _tmp5_;
+#line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp6_ = title;
+#line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp6_);
+#line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp8_ = spit_data_imports_load_services (FALSE, &_tmp7_);
+#line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ loaded_services = _tmp8_;
+#line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ loaded_services_length1 = _tmp7_;
+#line 224 "/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"
- _tmp10_ = loaded_services;
-#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp10__length1 = loaded_services_length1;
-#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp10__length1 > 0) {
-#line 1669 "DataImportsUI.c"
+#line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp9_ = loaded_services;
+#line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp9__length1 = loaded_services_length1;
+#line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ if (_tmp9__length1 > 0) {
+#line 1657 "DataImportsUI.c"
+ GtkComboBoxText* _tmp10_;
GtkComboBoxText* _tmp11_;
- GtkComboBoxText* _tmp12_;
gchar* last_used_service = NULL;
+ ConfigFacade* _tmp12_;
ConfigFacade* _tmp13_;
- ConfigFacade* _tmp14_;
+ gchar* _tmp14_;
gchar* _tmp15_;
- gchar* _tmp16_;
gint ticker = 0;
gint last_used_index = 0;
- SpitDataImportsService** _tmp17_;
- gint _tmp17__length1;
- gint _tmp31_;
- GtkComboBoxText* _tmp35_;
- gboolean _tmp36_;
-#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp11_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp11_);
-#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ SpitDataImportsService** _tmp16_;
+ gint _tmp16__length1;
+ gint _tmp30_;
+ GtkComboBoxText* _tmp34_;
+ gboolean _tmp35_;
+#line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp10_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_object_ref_sink (_tmp10_);
+#line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->service_selector_box);
+#line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ self->priv->service_selector_box = _tmp10_;
#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self->priv->service_selector_box = _tmp11_;
-#line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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 (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp13_ = config_facade_get_instance ();
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp14_ = _tmp13_;
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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"
- _tmp16_ = _tmp15_;
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_tmp14_);
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- last_used_service = _tmp16_;
-#line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp11_ = self->priv->service_selector_box;
+#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp12_ = config_facade_get_instance ();
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp13_ = _tmp12_;
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp14_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp15_ = _tmp14_;
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _g_object_unref0 (_tmp13_);
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ last_used_service = _tmp15_;
+#line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
ticker = 0;
-#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
last_used_index = -1;
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp17_ = loaded_services;
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp17__length1 = loaded_services_length1;
-#line 1716 "DataImportsUI.c"
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp16_ = loaded_services;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp16__length1 = loaded_services_length1;
+#line 1704 "DataImportsUI.c"
{
SpitDataImportsService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ service_collection = _tmp16_;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ service_collection_length1 = _tmp16__length1;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ for (service_it = 0; service_it < _tmp16__length1; service_it = service_it + 1) {
+#line 1716 "DataImportsUI.c"
+ SpitDataImportsService* _tmp17_;
+ SpitDataImportsService* service = NULL;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp17_ = _g_object_ref0 (service_collection[service_it]);
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ service = _tmp17_;
+#line 1723 "DataImportsUI.c"
+ {
+ gchar* curr_service_id = NULL;
+ SpitDataImportsService* _tmp18_;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
+ gboolean _tmp21_ = FALSE;
+ const gchar* _tmp22_;
+ GtkComboBoxText* _tmp26_;
+ SpitDataImportsService* _tmp27_;
+ const gchar* _tmp28_;
+ gint _tmp29_;
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_collection = _tmp17_;
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_collection_length1 = _tmp17__length1;
+ _tmp18_ = service;
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- for (service_it = 0; service_it < _tmp17__length1; service_it = service_it + 1) {
-#line 1728 "DataImportsUI.c"
- SpitDataImportsService* _tmp18_;
- SpitDataImportsService* service = NULL;
+ _tmp19_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp18_ = _g_object_ref0 (service_collection[service_it]);
+ _tmp20_ = g_strdup (_tmp19_);
#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service = _tmp18_;
-#line 1735 "DataImportsUI.c"
- {
- gchar* curr_service_id = NULL;
- SpitDataImportsService* _tmp19_;
- const gchar* _tmp20_;
- gchar* _tmp21_;
- gboolean _tmp22_ = FALSE;
- const gchar* _tmp23_;
- GtkComboBoxText* _tmp27_;
- SpitDataImportsService* _tmp28_;
- const gchar* _tmp29_;
- gint _tmp30_;
+ curr_service_id = _tmp20_;
#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp19_ = service;
+ _tmp22_ = last_used_service;
#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp20_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ if (_tmp22_ != NULL) {
+#line 1747 "DataImportsUI.c"
+ const gchar* _tmp23_;
+ const gchar* _tmp24_;
#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp21_ = g_strdup (_tmp20_);
+ _tmp23_ = last_used_service;
#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- curr_service_id = _tmp21_;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp23_ = last_used_service;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp23_ != NULL) {
-#line 1759 "DataImportsUI.c"
- const gchar* _tmp24_;
- const gchar* _tmp25_;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp24_ = last_used_service;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp25_ = curr_service_id;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp22_ = g_strcmp0 (_tmp24_, _tmp25_) == 0;
-#line 1768 "DataImportsUI.c"
+ _tmp24_ = curr_service_id;
+#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp21_ = g_strcmp0 (_tmp23_, _tmp24_) == 0;
+#line 1756 "DataImportsUI.c"
} else {
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp22_ = FALSE;
-#line 1772 "DataImportsUI.c"
+#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp21_ = FALSE;
+#line 1760 "DataImportsUI.c"
}
+#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ if (_tmp21_) {
+#line 1764 "DataImportsUI.c"
+ gint _tmp25_;
#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp22_) {
-#line 1776 "DataImportsUI.c"
- gint _tmp26_;
-#line 241 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp26_ = ticker;
-#line 241 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- last_used_index = _tmp26_;
-#line 1782 "DataImportsUI.c"
+ _tmp25_ = ticker;
+#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ last_used_index = _tmp25_;
+#line 1770 "DataImportsUI.c"
}
+#line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp26_ = self->priv->service_selector_box;
+#line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp27_ = service;
+#line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp28_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_combo_box_text_append_text (_tmp26_, _tmp28_);
#line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp27_ = self->priv->service_selector_box;
-#line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp28_ = service;
+ _tmp29_ = ticker;
#line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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 (_tmp27_, _tmp29_);
-#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp30_ = ticker;
-#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- ticker = _tmp30_ + 1;
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ ticker = _tmp29_ + 1;
+#line 237 "/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"
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service);
-#line 1800 "DataImportsUI.c"
+#line 1788 "DataImportsUI.c"
}
}
}
+#line 245 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp30_ = last_used_index;
+#line 245 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ if (_tmp30_ >= 0) {
+#line 1796 "DataImportsUI.c"
+ GtkComboBoxText* _tmp31_;
+ gint _tmp32_;
#line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp31_ = last_used_index;
+ _tmp31_ = self->priv->service_selector_box;
#line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp31_ >= 0) {
-#line 1808 "DataImportsUI.c"
- GtkComboBoxText* _tmp32_;
- gint _tmp33_;
-#line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp32_ = self->priv->service_selector_box;
-#line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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 (_tmp32_, gtk_combo_box_get_type (), GtkComboBox), _tmp33_);
-#line 1817 "DataImportsUI.c"
+ _tmp32_ = last_used_index;
+#line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), _tmp32_);
+#line 1805 "DataImportsUI.c"
} else {
- GtkComboBoxText* _tmp34_;
-#line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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 (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1824 "DataImportsUI.c"
+ GtkComboBoxText* _tmp33_;
+#line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp33_ = self->priv->service_selector_box;
+#line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1812 "DataImportsUI.c"
}
-#line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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 (_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"
- _tmp36_ = use_header;
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (!_tmp36_) {
-#line 1834 "DataImportsUI.c"
+#line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp34_ = self->priv->service_selector_box;
+#line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp35_ = use_header;
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ if (!_tmp35_) {
+#line 1822 "DataImportsUI.c"
GtkLabel* service_selector_box_label = NULL;
- const gchar* _tmp37_;
+ const gchar* _tmp36_;
+ GtkLabel* _tmp37_;
GtkLabel* _tmp38_;
- GtkLabel* _tmp39_;
- GtkComboBoxText* _tmp40_;
+ GtkComboBoxText* _tmp39_;
+ GtkLabel* _tmp40_;
GtkLabel* _tmp41_;
- GtkLabel* _tmp42_;
+ GtkComboBoxText* _tmp42_;
GtkComboBoxText* _tmp43_;
GtkComboBoxText* _tmp44_;
GtkComboBoxText* _tmp45_;
- GtkComboBoxText* _tmp46_;
GtkBox* service_selector_layouter = NULL;
+ GtkBox* _tmp46_;
GtkBox* _tmp47_;
GtkBox* _tmp48_;
- GtkBox* _tmp49_;
- GtkLabel* _tmp50_;
- GtkBox* _tmp51_;
- GtkComboBoxText* _tmp52_;
+ GtkLabel* _tmp49_;
+ GtkBox* _tmp50_;
+ GtkComboBoxText* _tmp51_;
GtkBox* service_area_layouter = NULL;
+ GtkBox* _tmp52_;
GtkBox* _tmp53_;
GtkBox* _tmp54_;
- GtkBox* _tmp55_;
GtkSeparator* service_central_separator = NULL;
- GtkSeparator* _tmp56_;
- GtkBox* _tmp57_;
- GtkSeparator* _tmp58_;
+ GtkSeparator* _tmp55_;
+ GtkBox* _tmp56_;
+ GtkSeparator* _tmp57_;
+ GtkBox* _tmp58_;
GtkBox* _tmp59_;
GtkBox* _tmp60_;
GtkBox* _tmp61_;
GtkBox* _tmp62_;
GtkBox* _tmp63_;
- GtkBox* _tmp64_;
+#line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp36_ = label;
+#line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp37_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp36_);
+#line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_object_ref_sink (_tmp37_);
+#line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ service_selector_box_label = _tmp37_;
#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp37_ = label;
+ _tmp38_ = service_selector_box_label;
#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp38_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp37_);
+ _tmp39_ = self->priv->service_selector_box;
#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp38_);
-#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_selector_box_label = _tmp38_;
-#line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp39_ = service_selector_box_label;
+ gtk_label_set_mnemonic_widget (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
#line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp40_ = self->priv->service_selector_box;
+ _tmp40_ = service_selector_box_label;
#line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_label_set_mnemonic_widget (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
#line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_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 (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 258 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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 (_tmp42_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp42_ = self->priv->service_selector_box;
+#line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
#line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_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 (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_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 (_tmp44_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_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 (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 267 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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 (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp46_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_object_ref_sink (_tmp46_);
+#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ service_selector_layouter = _tmp46_;
#line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp47_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+ _tmp47_ = service_selector_layouter;
#line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp47_);
-#line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_selector_layouter = _tmp47_;
+ gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_container_get_type (), GtkContainer), (guint) 12);
#line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_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 (_tmp48_, gtk_container_get_type (), GtkContainer), (guint) 12);
+ _tmp49_ = service_selector_box_label;
+#line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
#line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp49_ = service_selector_layouter;
+ _tmp50_ = service_selector_layouter;
#line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp50_ = service_selector_box_label;
+ _tmp51_ = self->priv->service_selector_box;
#line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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"
- _tmp51_ = service_selector_layouter;
-#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp52_ = self->priv->service_selector_box;
-#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_box_pack_start (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp52_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_object_ref_sink (_tmp52_);
+#line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ service_area_layouter = _tmp52_;
#line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp53_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp53_ = service_area_layouter;
#line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp53_);
+ _tmp54_ = service_selector_layouter;
#line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_area_layouter = _tmp53_;
+ gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp54_ = service_area_layouter;
+ _tmp55_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp55_ = service_selector_layouter;
+ g_object_ref_sink (_tmp55_);
#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_box_pack_start (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ service_central_separator = _tmp55_;
#line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp56_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ _tmp56_ = service_area_layouter;
#line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp56_);
+ _tmp57_ = service_central_separator;
#line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_central_separator = _tmp56_;
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
#line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp57_ = service_area_layouter;
+ _tmp58_ = service_area_layouter;
#line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp58_ = service_central_separator;
-#line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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));
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
#line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp59_ = service_area_layouter;
#line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
#line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp60_ = service_area_layouter;
#line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp61_ = service_area_layouter;
#line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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"
- _tmp62_ = service_area_layouter;
-#line 283 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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"
- _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"
- _tmp64_ = service_area_layouter;
-#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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"
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp62_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp63_ = service_area_layouter;
+#line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 252 "/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"
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service_area_layouter);
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service_selector_layouter);
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service_selector_box_label);
-#line 1981 "DataImportsUI.c"
+#line 1969 "DataImportsUI.c"
}
-#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_free0 (last_used_service);
-#line 1985 "DataImportsUI.c"
+#line 1973 "DataImportsUI.c"
}
+#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_object_ref_sink (_tmp64_);
+#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _g_object_unref0 (self->priv->central_area_layouter);
+#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ self->priv->central_area_layouter = _tmp64_;
#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp65_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp65_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_object_ref_sink (_tmp65_);
+ _tmp66_ = self->priv->central_area_layouter;
#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 = _tmp65_;
-#line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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"
- _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 (_tmp66_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ 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), TRUE, TRUE, (guint) 0);
+#line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp67_ = use_header;
+#line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ if (_tmp67_) {
+#line 1993 "DataImportsUI.c"
+ GtkButton* _tmp68_;
+ GtkButton* _tmp69_;
+ GtkWidget* _tmp70_;
+ GtkButton* _tmp71_;
+ GtkComboBoxText* _tmp72_;
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp68_ = use_header;
+ _tmp68_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_object_ref_sink (_tmp68_);
#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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"
- _tmp69_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
-#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ self->priv->close_cancel_button = _tmp68_;
#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self->priv->close_cancel_button = _tmp69_;
+ _tmp69_ = self->priv->close_cancel_button;
+#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp70_ = self->priv->close_cancel_button;
+ _tmp70_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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"
- _tmp71_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp71_ = self->priv->close_cancel_button;
+#line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget));
#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp72_ = self->priv->close_cancel_button;
+ _tmp72_ = self->priv->service_selector_box;
#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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));
+ if (_tmp72_ != NULL) {
+#line 2021 "DataImportsUI.c"
+ GtkWidget* _tmp73_;
+ GtkComboBoxText* _tmp74_;
+#line 298 "/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));
#line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp73_ = self->priv->service_selector_box;
+ _tmp74_ = self->priv->service_selector_box;
#line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp73_ != NULL) {
-#line 2033 "DataImportsUI.c"
- GtkWidget* _tmp74_;
- GtkComboBoxText* _tmp75_;
-#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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"
- _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 (_tmp74_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget));
-#line 2042 "DataImportsUI.c"
+ gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
+#line 2030 "DataImportsUI.c"
}
} else {
- GtkWidget* _tmp76_;
- GtkButton* _tmp77_;
-#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ GtkWidget* _tmp75_;
+ GtkButton* _tmp76_;
+#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
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"
- _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"
- _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"
+#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp75_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp76_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, gtk_button_get_type ()) ? ((GtkButton*) _tmp75_) : NULL);
+#line 303 "/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 = _tmp77_;
-#line 2057 "DataImportsUI.c"
+#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ self->priv->close_cancel_button = _tmp76_;
+#line 2045 "DataImportsUI.c"
}
-#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp78_ = self->priv->close_cancel_button;
-#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- 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"
+#line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp77_ = self->priv->close_cancel_button;
+#line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_signal_connect_object (_tmp77_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+#line 307 "/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"
- _tmp79_ = loaded_services;
-#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp79__length1 = loaded_services_length1;
-#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp79__length1 > 0) {
-#line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp78_ = loaded_services;
+#line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp78__length1 = loaded_services_length1;
+#line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ if (_tmp78__length1 > 0) {
+#line 311 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_on_service_changed (self);
-#line 2073 "DataImportsUI.c"
+#line 2061 "DataImportsUI.c"
} else {
+ DataImportsUIStaticMessagePane* _tmp79_;
DataImportsUIStaticMessagePane* _tmp80_;
- DataImportsUIStaticMessagePane* _tmp81_;
-#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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"
- _tmp81_ = _tmp80_;
+#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp79_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
+#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp80_ = _tmp79_;
+#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _g_object_unref0 (_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 (_tmp81_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
-#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _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 2087 "DataImportsUI.c"
+#line 2075 "DataImportsUI.c"
}
-#line 319 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 318 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -2100,14 +2088,14 @@ 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 2099 "DataImportsUI.c"
+#line 2087 "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 2106 "DataImportsUI.c"
+#line 2094 "DataImportsUI.c"
}
@@ -2116,72 +2104,72 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
DataImportsUIDataImportsDialog* _tmp0_;
DataImportsUIDataImportsDialog* _tmp2_;
DataImportsUIDataImportsDialog* _tmp3_;
-#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 322 "/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"
+#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ == NULL) {
-#line 2119 "DataImportsUI.c"
+#line 2107 "DataImportsUI.c"
DataImportsUIDataImportsDialog* _tmp1_;
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 323 "/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"
+#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_object_ref_sink (_tmp1_);
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_instance = _tmp1_;
-#line 2129 "DataImportsUI.c"
+#line 2117 "DataImportsUI.c"
}
-#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = data_imports_ui_data_imports_dialog_instance;
-#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
result = _tmp3_;
-#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 2139 "DataImportsUI.c"
+#line 2127 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_terminate_instance (void) {
DataImportsUIDataImportsDialog* _tmp0_;
-#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 329 "/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"
+#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
-#line 2149 "DataImportsUI.c"
+#line 2137 "DataImportsUI.c"
DataImportsUIDataImportsDialog* _tmp1_;
-#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 330 "/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"
+#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_terminate (_tmp1_);
-#line 2155 "DataImportsUI.c"
+#line 2143 "DataImportsUI.c"
}
-#line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 332 "/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"
+#line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2161 "DataImportsUI.c"
+#line 2149 "DataImportsUI.c"
}
static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt) {
gboolean result = FALSE;
-#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), FALSE);
-#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (evt != NULL, FALSE);
-#line 337 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:337: DataImportsDialog: on_window_close( ): invoked" \
+#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:336: DataImportsDialog: on_window_close( ): invoked" \
".");
-#line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 337 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_terminate (self);
-#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 339 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
result = TRUE;
-#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 339 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 2179 "DataImportsUI.c"
+#line 2167 "DataImportsUI.c"
}
@@ -2205,232 +2193,232 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
SpitDataImportsService* _tmp16_;
SpitDataImportsConcreteDataImportsHost* _tmp17_;
SpitDataImportsConcreteDataImportsHost* _tmp18_;
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
+#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:343: DataImportsDialog: on_service_changed invoked.");
#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:344: DataImportsDialog: on_service_changed invoked.");
-#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = gtk_combo_box_text_get_active_text (_tmp0_);
-#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
service_name = _tmp1_;
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
selected_service = NULL;
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = spit_data_imports_load_all_services (&_tmp2_);
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
services = _tmp3_;
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
services_length1 = _tmp2_;
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_services_size_ = services_length1;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4_ = services;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4__length1 = services_length1;
-#line 2227 "DataImportsUI.c"
+#line 2215 "DataImportsUI.c"
{
SpitDataImportsService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
service_collection = _tmp4_;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
service_collection_length1 = _tmp4__length1;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) {
-#line 2239 "DataImportsUI.c"
+#line 2227 "DataImportsUI.c"
SpitDataImportsService* _tmp5_;
SpitDataImportsService* service = NULL;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/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"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
service = _tmp5_;
-#line 2246 "DataImportsUI.c"
+#line 2234 "DataImportsUI.c"
{
SpitDataImportsService* _tmp6_;
const gchar* _tmp7_;
const gchar* _tmp8_;
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp6_ = service;
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp7_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp8_ = service_name;
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2259 "DataImportsUI.c"
+#line 2247 "DataImportsUI.c"
SpitDataImportsService* _tmp9_;
SpitDataImportsService* _tmp10_;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp9_ = service;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (selected_service);
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
selected_service = _tmp10_;
-#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service);
-#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
break;
-#line 2274 "DataImportsUI.c"
+#line 2262 "DataImportsUI.c"
}
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service);
-#line 2278 "DataImportsUI.c"
+#line 2266 "DataImportsUI.c"
}
}
}
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp11_ = selected_service;
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_vala_assert (_tmp11_ != NULL, "selected_service != null");
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp12_ = config_facade_get_instance ();
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp13_ = _tmp12_;
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp14_ = selected_service;
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp15_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
configuration_facade_set_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp13_);
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp16_ = selected_service;
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp17_ = spit_data_imports_concrete_data_imports_host_new (_tmp16_, self);
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->host);
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->host = _tmp17_;
-#line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp18_ = self->priv->host;
-#line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spit_data_imports_plugin_host_start_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (selected_service);
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_free0 (service_name);
-#line 2316 "DataImportsUI.c"
+#line 2304 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self) {
-#line 363 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 364 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:364: DataImportsDialog: on_close_cancel_clicked( ):" \
+#line 363 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:363: DataImportsDialog: on_close_cancel_clicked( ):" \
" invoked.");
-#line 366 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_terminate (self);
-#line 2327 "DataImportsUI.c"
+#line 2315 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) {
SpitDataImportsConcreteDataImportsHost* _tmp0_;
-#line 369 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 368 "/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"
- g_debug ("DataImportsUI.vala:370: DataImportsDialog: terminate( ): invoked.");
-#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:369: DataImportsDialog: terminate( ): invoked.");
+#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->host;
-#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
-#line 2341 "DataImportsUI.c"
+#line 2329 "DataImportsUI.c"
SpitDataImportsConcreteDataImportsHost* _tmp1_;
-#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = self->priv->host;
-#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->host);
-#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->host = NULL;
-#line 2351 "DataImportsUI.c"
+#line 2339 "DataImportsUI.c"
}
-#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2361 "DataImportsUI.c"
+#line 2349 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) {
GtkBox* _tmp0_;
-#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 381 "/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"
+#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 384 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 384 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
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"
+#line 385 "/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 2377 "DataImportsUI.c"
+#line 2365 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) {
GtkBox* _tmp0_;
-#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 388 "/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"
+#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 391 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 391 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
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"
+#line 392 "/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 2393 "DataImportsUI.c"
+#line 2381 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) {
GtkBox* _tmp0_;
-#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 395 "/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"
+#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 398 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 398 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
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"
+#line 399 "/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 2409 "DataImportsUI.c"
+#line 2397 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
-#line 403 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 403 "/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 2418 "DataImportsUI.c"
+#line 2406 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
-#line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 407 "/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 2427 "DataImportsUI.c"
+#line 2415 "DataImportsUI.c"
}
@@ -2438,70 +2426,70 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (
SpitDataImportsDialogPane* result = NULL;
SpitDataImportsDialogPane* _tmp0_;
SpitDataImportsDialogPane* _tmp1_;
-#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 410 "/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"
+#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
result = _tmp1_;
-#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 2445 "DataImportsUI.c"
+#line 2433 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self) {
GtkButton* _tmp0_;
GtkButton* _tmp1_;
-#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 414 "/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"
+#line 415 "/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"
+#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_button_set_label (_tmp0_, _ ("_Close"));
-#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = self->priv->close_cancel_button;
-#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 416 "/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 (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2462 "DataImportsUI.c"
+#line 2450 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) {
GtkButton* _tmp0_;
-#line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 419 "/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"
+#line 420 "/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"
+#line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_button_set_label (_tmp0_, _ ("_Cancel"));
-#line 2474 "DataImportsUI.c"
+#line 2462 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) {
GtkComboBoxText* _tmp0_;
-#line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 423 "/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"
+#line 424 "/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"
+#line 424 "/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 2486 "DataImportsUI.c"
+#line 2474 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) {
GtkComboBoxText* _tmp0_;
-#line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 427 "/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"
+#line 428 "/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"
+#line 428 "/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 2498 "DataImportsUI.c"
+#line 2486 "DataImportsUI.c"
}
@@ -2519,110 +2507,110 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
SpitDataImportsDialogPane* _tmp15_;
SpitDataImportsDialogPane* _tmp16_;
SpitDataImportsDialogPane* _tmp17_;
-#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 431 "/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"
+#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane));
-#line 433 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:433: DataImportsDialog: install_pane( ): invoked.");
-#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:432: DataImportsDialog: install_pane( ): invoked.");
+#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
-#line 2526 "DataImportsUI.c"
+#line 2514 "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 " \
+#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:435: DataImportsDialog: install_pane( ): a pane is " \
"already installed; removing it.");
-#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = self->priv->active_pane;
-#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spit_data_imports_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = self->priv->central_area_layouter;
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = self->priv->active_pane;
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4_ = spit_data_imports_dialog_pane_get_widget (_tmp3_);
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp5_ = _tmp4_;
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
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"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp5_);
-#line 2550 "DataImportsUI.c"
+#line 2538 "DataImportsUI.c"
}
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp6_ = self->priv->central_area_layouter;
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp7_ = pane;
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp8_ = spit_data_imports_dialog_pane_get_widget (_tmp7_);
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp9_ = _tmp8_;
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp9_);
-#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp10_ = pane;
-#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp11_ = spit_data_imports_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
geometry_options = _tmp11_;
-#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp12_ = geometry_options;
-#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_large_window_mode (self);
-#line 2578 "DataImportsUI.c"
+#line 2566 "DataImportsUI.c"
} else {
SpitDataImportsDialogPaneGeometryOptions _tmp13_;
-#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp13_ = geometry_options;
-#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 448 "/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"
+#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_colossal_window_mode (self);
-#line 2587 "DataImportsUI.c"
+#line 2575 "DataImportsUI.c"
} else {
-#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 451 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
-#line 2591 "DataImportsUI.c"
+#line 2579 "DataImportsUI.c"
}
}
-#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp14_ = geometry_options;
-#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 455 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (self);
-#line 2600 "DataImportsUI.c"
+#line 2588 "DataImportsUI.c"
} else {
-#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 456 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (self);
-#line 2604 "DataImportsUI.c"
+#line 2592 "DataImportsUI.c"
}
-#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp15_ = pane;
-#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->active_pane);
-#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->active_pane = _tmp16_;
-#line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp17_ = pane;
-#line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spit_data_imports_dialog_pane_on_pane_installed (_tmp17_);
-#line 2618 "DataImportsUI.c"
+#line 2606 "DataImportsUI.c"
}
@@ -2633,14 +2621,14 @@ 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 2629 "DataImportsUI.c"
+#line 2617 "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 2636 "DataImportsUI.c"
+#line 2624 "DataImportsUI.c"
}
@@ -2660,7 +2648,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 2656 "DataImportsUI.c"
+#line 2644 "DataImportsUI.c"
}
diff --git a/src/data_imports/DataImportsUI.vala b/src/data_imports/DataImportsUI.vala
index 2c0cd40..29791a4 100644
--- a/src/data_imports/DataImportsUI.vala
+++ b/src/data_imports/DataImportsUI.vala
@@ -208,9 +208,8 @@ public class DataImportsDialog : Gtk.Dialog {
private Spit.DataImports.ConcreteDataImportsHost host;
protected DataImportsDialog() {
- bool use_header = false;
- Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
- Object(use_header_bar: use_header ? 1 : 0);
+ bool use_header = Resources.use_header_bar() == 1;
+ Object(use_header_bar: Resources.use_header_bar());
if (use_header)
((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);