From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/data_imports/DataImportsPluginHost.c | 341 ++++++++++++++++--------------- 1 file changed, 171 insertions(+), 170 deletions(-) (limited to 'src/data_imports/DataImportsPluginHost.c') 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" } -- cgit v1.2.3