diff options
Diffstat (limited to 'src/data_imports/DataImportsPluginHost.c')
| -rw-r--r-- | src/data_imports/DataImportsPluginHost.c | 1305 |
1 files changed, 645 insertions, 660 deletions
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c index 6fea799..0c9913d 100644 --- a/src/data_imports/DataImportsPluginHost.c +++ b/src/data_imports/DataImportsPluginHost.c @@ -1,4 +1,4 @@ -/* DataImportsPluginHost.c generated by valac 0.34.7, the Vala compiler +/* DataImportsPluginHost.c generated by valac 0.36.6, the Vala compiler * generated from DataImportsPluginHost.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -452,11 +452,11 @@ struct _ImportManifestClass { static gpointer spit_data_imports_core_importer_parent_class = NULL; static gpointer spit_data_imports_concrete_data_imports_host_parent_class = NULL; -static SpitDataImportsPluginHostIface* spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL; +static SpitDataImportsPluginHostIface * spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL; static gpointer spit_data_imports_welcome_data_imports_host_parent_class = NULL; -static SpitDataImportsPluginHostIface* spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL; +static SpitDataImportsPluginHostIface * spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = NULL; static gpointer spit_data_imports_welcome_import_service_entry_parent_class = NULL; -static WelcomeServiceEntryIface* spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = NULL; +static WelcomeServiceEntryIface * spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = NULL; static gpointer spit_data_imports_welcome_import_meta_host_parent_class = NULL; extern ImportManifest* spit_data_imports_meta_manifest; ImportManifest* spit_data_imports_meta_manifest = NULL; @@ -529,7 +529,7 @@ GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel); void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self); -static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter* obj); +static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj); GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST; GType spit_data_imports_concrete_data_imports_host_get_type (void) G_GNUC_CONST; GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST; @@ -571,7 +571,7 @@ void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* s static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message); static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message); void library_window_switch_to_import_queue_page (LibraryWindow* self); -static void spit_data_imports_concrete_data_imports_host_finalize (GObject* obj); +static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj); GType spit_data_imports_welcome_data_imports_host_get_type (void) G_GNUC_CONST; GType spit_data_imports_welcome_import_meta_host_get_type (void) G_GNUC_CONST; #define SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHostPrivate)) @@ -599,7 +599,7 @@ static void spit_data_imports_welcome_data_imports_host_real_update_import_progr static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message); static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message); void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host); -static void spit_data_imports_welcome_data_imports_host_finalize (GObject* obj); +static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj); #define SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntryPrivate)) enum { SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_DUMMY_PROPERTY @@ -607,7 +607,7 @@ enum { static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImportableLibrary** self, int length); static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base); static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base); -static void spit_data_imports_welcome_import_service_entry_finalize (GObject* obj); +static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj); GType welcome_dialog_get_type (void) G_GNUC_CONST; #define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHostPrivate)) enum { @@ -619,14 +619,14 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1); gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self); void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry); -static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj); +static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj); SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1); GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); gchar* plugins_get_pluggable_module_id (SpitPluggable* needle); -static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value); -static gint __lambda22_ (void* a, void* b); +static void _vala_array_add69 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value); +static gint __lambda23_ (void* a, void* b); gint utf8_cs_compare (void* a, void* b); -static gint ___lambda22____compar_fn_t (void* key1, void* key2); +static gint ___lambda23____compar_fn_t (void* key1, void* key2); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -657,7 +657,7 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType object_type, SpitDataImportsPluginHost* host) { SpitDataImportsCoreImporter* self = NULL; - SpitDataImportsPluginHost* _tmp0_ = NULL; + SpitDataImportsPluginHost* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL); #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -703,28 +703,28 @@ static void _spit_data_imports_data_import_reporter_batch_import_import_reporter void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) { - SpitDataImportsPluginHost* _tmp0_ = NULL; - gdouble _tmp1_ = 0.0; - const gchar* _tmp2_ = NULL; + SpitDataImportsPluginHost* _tmp0_; + gdouble _tmp1_; + const gchar* _tmp2_; SortedList* jobs = NULL; - SortedList* _tmp3_ = NULL; + SortedList* _tmp3_; GeeArrayList* already_imported = NULL; - GeeArrayList* _tmp4_ = NULL; + GeeArrayList* _tmp4_; GeeArrayList* failed = NULL; - GeeArrayList* _tmp5_ = NULL; + GeeArrayList* _tmp5_; gint item_idx = 0; gdouble item_progress_delta = 0.0; - gdouble _tmp6_ = 0.0; - SpitDataImportsImportableMediaItem** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - SpitDataImportsImportableMediaItem** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - SortedList* _tmp39_ = NULL; - gint _tmp40_ = 0; - gint _tmp41_ = 0; - SpitDataImportsPluginHost* _tmp66_ = NULL; - gdouble _tmp67_ = 0.0; - gdouble _tmp68_ = 0.0; + gdouble _tmp6_; + SpitDataImportsImportableMediaItem** _tmp7_; + gint _tmp7__length1; + SpitDataImportsImportableMediaItem** _tmp8_; + gint _tmp8__length1; + SortedList* _tmp39_; + gint _tmp40_; + gint _tmp41_; + SpitDataImportsPluginHost* _tmp65_; + gdouble _tmp66_; + gdouble _tmp67_; #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_CORE_IMPORTER (self)); #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -774,7 +774,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" for (src_item_it = 0; src_item_it < _tmp8__length1; src_item_it = src_item_it + 1) { #line 777 "DataImportsPluginHost.c" - SpitDataImportsImportableMediaItem* _tmp9_ = NULL; + SpitDataImportsImportableMediaItem* _tmp9_; SpitDataImportsImportableMediaItem* src_item = NULL; #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp9_ = _g_object_ref0 (src_item_collection[src_item_it]); @@ -783,21 +783,21 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp #line 784 "DataImportsPluginHost.c" { SpitDataImportsDataImportSource* import_source = NULL; - SpitDataImportsImportableMediaItem* _tmp10_ = NULL; - SpitDataImportsDataImportSource* _tmp11_ = NULL; - SpitDataImportsDataImportSource* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - SpitDataImportsDataImportSource* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - SortedList* _tmp30_ = NULL; - SpitDataImportsDataImportSource* _tmp31_ = NULL; - SpitDataImportsDataImportJob* _tmp32_ = NULL; - SpitDataImportsDataImportJob* _tmp33_ = NULL; - gint _tmp34_ = 0; - SpitDataImportsPluginHost* _tmp35_ = NULL; - gdouble _tmp36_ = 0.0; - gint _tmp37_ = 0; - gdouble _tmp38_ = 0.0; + SpitDataImportsImportableMediaItem* _tmp10_; + SpitDataImportsDataImportSource* _tmp11_; + SpitDataImportsDataImportSource* _tmp12_; + gboolean _tmp13_; + SpitDataImportsDataImportSource* _tmp21_; + gboolean _tmp22_; + SortedList* _tmp30_; + SpitDataImportsDataImportSource* _tmp31_; + SpitDataImportsDataImportJob* _tmp32_; + SpitDataImportsDataImportJob* _tmp33_; + gint _tmp34_; + SpitDataImportsPluginHost* _tmp35_; + gdouble _tmp36_; + gint _tmp37_; + gdouble _tmp38_; #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp10_ = src_item; #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -811,13 +811,13 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (!_tmp13_) { #line 814 "DataImportsPluginHost.c" - SpitDataImportsDataImportSource* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - GeeArrayList* _tmp17_ = NULL; - SpitDataImportsDataImportSource* _tmp18_ = NULL; - SpitDataImportsDataImportJob* _tmp19_ = NULL; - SpitDataImportsDataImportJob* _tmp20_ = NULL; + SpitDataImportsDataImportSource* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + GeeArrayList* _tmp17_; + SpitDataImportsDataImportSource* _tmp18_; + SpitDataImportsDataImportJob* _tmp19_; + SpitDataImportsDataImportJob* _tmp20_; #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp14_ = import_source; #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -856,13 +856,13 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp22_) { #line 858 "DataImportsPluginHost.c" - SpitDataImportsDataImportSource* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - GeeArrayList* _tmp26_ = NULL; - SpitDataImportsDataImportSource* _tmp27_ = NULL; - SpitDataImportsDataImportJob* _tmp28_ = NULL; - SpitDataImportsDataImportJob* _tmp29_ = NULL; + SpitDataImportsDataImportSource* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + GeeArrayList* _tmp26_; + SpitDataImportsDataImportSource* _tmp27_; + SpitDataImportsDataImportJob* _tmp28_; + SpitDataImportsDataImportJob* _tmp29_; #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp23_ = import_source; #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -937,194 +937,188 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp41_ > 0) { #line 938 "DataImportsPluginHost.c" - BatchImportRoll* _tmp42_ = NULL; + BatchImportRoll* _tmp42_; gchar* db_name = NULL; - const gchar* _tmp44_ = NULL; - SpitDataImportsPluginHost* _tmp45_ = NULL; - SpitDataImportsDataImporter* _tmp46_ = NULL; - SpitDataImportsDataImporter* _tmp47_ = NULL; - SpitDataImportsService* _tmp48_ = NULL; - SpitDataImportsService* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; + SpitDataImportsPluginHost* _tmp44_; + SpitDataImportsDataImporter* _tmp45_; + SpitDataImportsDataImporter* _tmp46_; + SpitDataImportsService* _tmp47_; + SpitDataImportsService* _tmp48_; + const gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; BatchImport* batch_import = NULL; - SortedList* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; - GeeArrayList* _tmp55_ = NULL; - GeeArrayList* _tmp56_ = NULL; - BatchImportRoll* _tmp57_ = NULL; - BatchImport* _tmp58_ = NULL; - LibraryWindow* _tmp59_ = NULL; - LibraryWindow* _tmp60_ = NULL; - BatchImport* _tmp61_ = NULL; - gint _tmp62_ = 0; - SortedList* _tmp63_ = NULL; - gint _tmp64_ = 0; - gint _tmp65_ = 0; + SortedList* _tmp52_; + const gchar* _tmp53_; + GeeArrayList* _tmp54_; + GeeArrayList* _tmp55_; + BatchImportRoll* _tmp56_; + BatchImport* _tmp57_; + LibraryWindow* _tmp58_; + LibraryWindow* _tmp59_; + BatchImport* _tmp60_; + gint _tmp61_; + SortedList* _tmp62_; + gint _tmp63_; + gint _tmp64_; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp42_ = self->current_import_roll; #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp42_ == NULL) { -#line 968 "DataImportsPluginHost.c" - BatchImportRoll* _tmp43_ = NULL; +#line 967 "DataImportsPluginHost.c" + BatchImportRoll* _tmp43_; #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp43_ = batch_import_roll_new (); #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _batch_import_roll_unref0 (self->current_import_roll); #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->current_import_roll = _tmp43_; -#line 976 "DataImportsPluginHost.c" +#line 975 "DataImportsPluginHost.c" } #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp44_ = _ ("%s Database"); + _tmp44_ = self->priv->host; #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp45_ = self->priv->host; + _tmp45_ = spit_data_imports_plugin_host_get_data_importer (_tmp44_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp46_ = spit_data_imports_plugin_host_get_data_importer (_tmp45_); + _tmp46_ = _tmp45_; #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp47_ = _tmp46_; + _tmp47_ = spit_data_imports_data_importer_get_service (_tmp46_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp48_ = spit_data_imports_data_importer_get_service (_tmp47_); + _tmp48_ = _tmp47_; #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp49_ = _tmp48_; + _tmp49_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp50_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp50_ = g_strdup_printf (_ ("%s Database"), _tmp49_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp51_ = g_strdup_printf (_tmp44_, _tmp50_); + _tmp51_ = _tmp50_; #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp52_ = _tmp51_; + _g_object_unref0 (_tmp48_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp49_); + _g_object_unref0 (_tmp46_); #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp47_); -#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - db_name = _tmp52_; + db_name = _tmp51_; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp53_ = jobs; + _tmp52_ = jobs; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp54_ = db_name; + _tmp53_ = db_name; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp55_ = failed; + _tmp54_ = failed; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp56_ = already_imported; + _tmp55_ = already_imported; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp57_ = self->current_import_roll; + _tmp56_ = self->current_import_roll; #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp58_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable), _tmp54_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp55_, _tmp56_, NULL, _tmp57_, NULL); + _tmp57_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable), _tmp53_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp54_, _tmp55_, NULL, _tmp56_, NULL); #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - batch_import = _tmp58_; + batch_import = _tmp57_; #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp59_ = library_window_get_app (); + _tmp58_ = library_window_get_app (); #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp60_ = _tmp59_; + _tmp59_ = _tmp58_; #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp61_ = batch_import; + _tmp60_ = batch_import; #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - library_window_enqueue_batch_import (_tmp60_, _tmp61_, TRUE); + library_window_enqueue_batch_import (_tmp59_, _tmp60_, TRUE); #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp60_); + _g_object_unref0 (_tmp59_); #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp62_ = self->imported_items_count; + _tmp61_ = self->imported_items_count; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp63_ = jobs; + _tmp62_ = jobs; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp64_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp63_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection)); #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp65_ = _tmp64_; + _tmp64_ = _tmp63_; #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - self->imported_items_count = _tmp62_ + _tmp65_; + self->imported_items_count = _tmp61_ + _tmp64_; #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (batch_import); #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (db_name); -#line 1040 "DataImportsPluginHost.c" +#line 1037 "DataImportsPluginHost.c" } #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp66_ = self->priv->host; + _tmp65_ = self->priv->host; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp67_ = progress; + _tmp66_ = progress; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp68_ = host_progress_delta; + _tmp67_ = host_progress_delta; #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_plugin_host_update_import_progress_pane (_tmp66_, _tmp67_ + _tmp68_, NULL); + spit_data_imports_plugin_host_update_import_progress_pane (_tmp65_, _tmp66_ + _tmp67_, NULL); #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (failed); #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (already_imported); #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (jobs); -#line 1056 "DataImportsPluginHost.c" +#line 1053 "DataImportsPluginHost.c" } void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self) { gchar* db_name = NULL; - const gchar* _tmp0_ = NULL; - SpitDataImportsPluginHost* _tmp1_ = NULL; - SpitDataImportsDataImporter* _tmp2_ = NULL; - SpitDataImportsDataImporter* _tmp3_ = NULL; - SpitDataImportsService* _tmp4_ = NULL; - SpitDataImportsService* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + SpitDataImportsPluginHost* _tmp0_; + SpitDataImportsDataImporter* _tmp1_; + SpitDataImportsDataImporter* _tmp2_; + SpitDataImportsService* _tmp3_; + SpitDataImportsService* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; BatchImport* batch_import = NULL; - GeeArrayList* _tmp9_ = NULL; - GeeArrayList* _tmp10_ = NULL; - BatchImportRoll* _tmp11_ = NULL; - BatchImport* _tmp12_ = NULL; - BatchImport* _tmp13_ = NULL; - LibraryWindow* _tmp14_ = NULL; - LibraryWindow* _tmp15_ = NULL; + GeeArrayList* _tmp8_; + GeeArrayList* _tmp9_; + BatchImportRoll* _tmp10_; + BatchImport* _tmp11_; + BatchImport* _tmp12_; + LibraryWindow* _tmp13_; + LibraryWindow* _tmp14_; #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_CORE_IMPORTER (self)); #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = _ ("%s Database"); -#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = self->priv->host; + _tmp0_ = self->priv->host; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = spit_data_imports_plugin_host_get_data_importer (_tmp1_); + _tmp1_ = spit_data_imports_plugin_host_get_data_importer (_tmp0_); #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = spit_data_imports_data_importer_get_service (_tmp3_); + _tmp3_ = spit_data_imports_data_importer_get_service (_tmp2_); #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp5_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = g_strdup_printf (_tmp0_, _tmp6_); + _tmp6_ = g_strdup_printf (_ ("%s Database"), _tmp5_); #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - db_name = _tmp8_; + db_name = _tmp7_; #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp9_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp11_ = self->current_import_roll; + _tmp10_ = self->current_import_roll; #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp12_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable), db_name, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, NULL, NULL, NULL, _tmp11_, NULL); + _tmp11_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable), db_name, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, NULL, NULL, NULL, _tmp10_, NULL); #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - batch_import = _tmp13_; + batch_import = _tmp12_; #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp14_ = library_window_get_app (); + _tmp13_ = library_window_get_app (); #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - library_window_enqueue_batch_import (_tmp15_, batch_import, TRUE); + library_window_enqueue_batch_import (_tmp14_, batch_import, TRUE); #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _batch_import_roll_unref0 (self->current_import_roll); #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1133,14 +1127,14 @@ void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporte _g_object_unref0 (batch_import); #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (db_name); -#line 1135 "DataImportsPluginHost.c" +#line 1129 "DataImportsPluginHost.c" } static void spit_data_imports_value_core_importer_init (GValue* value) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = NULL; -#line 1142 "DataImportsPluginHost.c" +#line 1136 "DataImportsPluginHost.c" } @@ -1149,7 +1143,7 @@ static void spit_data_imports_value_core_importer_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_unref (value->data[0].v_pointer); -#line 1151 "DataImportsPluginHost.c" +#line 1145 "DataImportsPluginHost.c" } } @@ -1159,11 +1153,11 @@ static void spit_data_imports_value_core_importer_copy_value (const GValue* src_ if (src_value->data[0].v_pointer) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" dest_value->data[0].v_pointer = spit_data_imports_core_importer_ref (src_value->data[0].v_pointer); -#line 1161 "DataImportsPluginHost.c" +#line 1155 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" dest_value->data[0].v_pointer = NULL; -#line 1165 "DataImportsPluginHost.c" +#line 1159 "DataImportsPluginHost.c" } } @@ -1171,66 +1165,66 @@ static void spit_data_imports_value_core_importer_copy_value (const GValue* src_ static gpointer spit_data_imports_value_core_importer_peek_pointer (const GValue* value) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return value->data[0].v_pointer; -#line 1173 "DataImportsPluginHost.c" +#line 1167 "DataImportsPluginHost.c" } static gchar* spit_data_imports_value_core_importer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (collect_values[0].v_pointer) { -#line 1180 "DataImportsPluginHost.c" - SpitDataImportsCoreImporter* object; +#line 1174 "DataImportsPluginHost.c" + SpitDataImportsCoreImporter * object; object = collect_values[0].v_pointer; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (object->parent_instance.g_class == NULL) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1187 "DataImportsPluginHost.c" +#line 1181 "DataImportsPluginHost.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1191 "DataImportsPluginHost.c" +#line 1185 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = spit_data_imports_core_importer_ref (object); -#line 1195 "DataImportsPluginHost.c" +#line 1189 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = NULL; -#line 1199 "DataImportsPluginHost.c" +#line 1193 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return NULL; -#line 1203 "DataImportsPluginHost.c" +#line 1197 "DataImportsPluginHost.c" } static gchar* spit_data_imports_value_core_importer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SpitDataImportsCoreImporter** object_p; + SpitDataImportsCoreImporter ** object_p; object_p = collect_values[0].v_pointer; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (!object_p) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1214 "DataImportsPluginHost.c" +#line 1208 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (!value->data[0].v_pointer) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *object_p = NULL; -#line 1220 "DataImportsPluginHost.c" +#line 1214 "DataImportsPluginHost.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *object_p = value->data[0].v_pointer; -#line 1224 "DataImportsPluginHost.c" +#line 1218 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *object_p = spit_data_imports_core_importer_ref (value->data[0].v_pointer); -#line 1228 "DataImportsPluginHost.c" +#line 1222 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return NULL; -#line 1232 "DataImportsPluginHost.c" +#line 1226 "DataImportsPluginHost.c" } @@ -1244,7 +1238,7 @@ GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const G_PARAM_SPEC (spec)->value_type = object_type; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return G_PARAM_SPEC (spec); -#line 1246 "DataImportsPluginHost.c" +#line 1240 "DataImportsPluginHost.c" } @@ -1253,12 +1247,12 @@ gpointer spit_data_imports_value_get_core_importer (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER), NULL); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return value->data[0].v_pointer; -#line 1255 "DataImportsPluginHost.c" +#line 1249 "DataImportsPluginHost.c" } void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object) { - SpitDataImportsCoreImporter* old; + SpitDataImportsCoreImporter * old; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER)); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1273,23 +1267,23 @@ void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object value->data[0].v_pointer = v_object; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_ref (value->data[0].v_pointer); -#line 1275 "DataImportsPluginHost.c" +#line 1269 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = NULL; -#line 1279 "DataImportsPluginHost.c" +#line 1273 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (old) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_unref (old); -#line 1285 "DataImportsPluginHost.c" +#line 1279 "DataImportsPluginHost.c" } } void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_object) { - SpitDataImportsCoreImporter* old; + SpitDataImportsCoreImporter * old; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER)); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1302,17 +1296,17 @@ void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_objec g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = v_object; -#line 1304 "DataImportsPluginHost.c" +#line 1298 "DataImportsPluginHost.c" } else { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" value->data[0].v_pointer = NULL; -#line 1308 "DataImportsPluginHost.c" +#line 1302 "DataImportsPluginHost.c" } #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (old) { #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_unref (old); -#line 1314 "DataImportsPluginHost.c" +#line 1308 "DataImportsPluginHost.c" } } @@ -1324,7 +1318,7 @@ static void spit_data_imports_core_importer_class_init (SpitDataImportsCoreImpor ((SpitDataImportsCoreImporterClass *) klass)->finalize = spit_data_imports_core_importer_finalize; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_type_class_add_private (klass, sizeof (SpitDataImportsCoreImporterPrivate)); -#line 1326 "DataImportsPluginHost.c" +#line 1320 "DataImportsPluginHost.c" } @@ -1337,11 +1331,11 @@ static void spit_data_imports_core_importer_instance_init (SpitDataImportsCoreIm self->current_import_roll = NULL; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->ref_count = 1; -#line 1339 "DataImportsPluginHost.c" +#line 1333 "DataImportsPluginHost.c" } -static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter* obj) { +static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj) { SpitDataImportsCoreImporter * self; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, SpitDataImportsCoreImporter); @@ -1349,7 +1343,7 @@ static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporte g_signal_handlers_destroy (self); #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _batch_import_roll_unref0 (self->current_import_roll); -#line 1351 "DataImportsPluginHost.c" +#line 1345 "DataImportsPluginHost.c" } @@ -1368,18 +1362,18 @@ GType spit_data_imports_core_importer_get_type (void) { gpointer spit_data_imports_core_importer_ref (gpointer instance) { - SpitDataImportsCoreImporter* self; + SpitDataImportsCoreImporter * self; self = instance; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_atomic_int_inc (&self->ref_count); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return instance; -#line 1376 "DataImportsPluginHost.c" +#line 1370 "DataImportsPluginHost.c" } void spit_data_imports_core_importer_unref (gpointer instance) { - SpitDataImportsCoreImporter* self; + SpitDataImportsCoreImporter * self; self = instance; #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1387,18 +1381,18 @@ void spit_data_imports_core_importer_unref (gpointer instance) { SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_CLASS (self)->finalize (self); #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1389 "DataImportsPluginHost.c" +#line 1383 "DataImportsPluginHost.c" } } SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) { SpitDataImportsConcreteDataImportsHost * self = NULL; - SpitDataImportsService* _tmp0_ = NULL; - DataImportsUIDataImportsDialog* _tmp1_ = NULL; - SpitDataImportsService* _tmp2_ = NULL; - SpitDataImportsDataImporter* _tmp3_ = NULL; - SpitDataImportsCoreImporter* _tmp4_ = NULL; + SpitDataImportsService* _tmp0_; + DataImportsUIDataImportsDialog* _tmp1_; + SpitDataImportsService* _tmp2_; + SpitDataImportsDataImporter* _tmp3_; + SpitDataImportsCoreImporter* _tmp4_; #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL); #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1427,22 +1421,22 @@ SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_ self->priv->core_importer = _tmp4_; #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self; -#line 1429 "DataImportsPluginHost.c" +#line 1423 "DataImportsPluginHost.c" } SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) { #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return spit_data_imports_concrete_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, service, dialog); -#line 1436 "DataImportsPluginHost.c" +#line 1430 "DataImportsPluginHost.c" } static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) { SpitDataImportsConcreteDataImportsHost * self; SpitDataImportsDataImporter* result = NULL; - SpitDataImportsDataImporter* _tmp0_ = NULL; - SpitDataImportsDataImporter* _tmp1_ = NULL; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsDataImporter* _tmp1_; #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1453,18 +1447,18 @@ static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host result = _tmp1_; #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 1455 "DataImportsPluginHost.c" +#line 1449 "DataImportsPluginHost.c" } static void spit_data_imports_concrete_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) { SpitDataImportsConcreteDataImportsHost * self; - SpitDataImportsDataImporter* _tmp0_ = NULL; - SpitDataImportsDataImporter* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - SpitDataImportsDataImporter* _tmp4_ = NULL; - SpitDataImportsDataImporter* _tmp5_ = NULL; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsDataImporter* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; + SpitDataImportsDataImporter* _tmp4_; + SpitDataImportsDataImporter* _tmp5_; #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1481,7 +1475,7 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S if (_tmp3_) { #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return; -#line 1483 "DataImportsPluginHost.c" +#line 1477 "DataImportsPluginHost.c" } #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_debug ("DataImportsPluginHost.vala:112: ConcreteDataImportsHost.start_importin" \ @@ -1494,16 +1488,16 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S spit_data_imports_data_importer_start (_tmp5_); #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp5_); -#line 1495 "DataImportsPluginHost.c" +#line 1489 "DataImportsPluginHost.c" } static void spit_data_imports_concrete_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) { SpitDataImportsConcreteDataImportsHost * self; - SpitDataImportsDataImporter* _tmp0_ = NULL; - SpitDataImportsDataImporter* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsDataImporter* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1521,9 +1515,9 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp _g_object_unref0 (_tmp1_); #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp3_) { -#line 1521 "DataImportsPluginHost.c" - SpitDataImportsDataImporter* _tmp4_ = NULL; - SpitDataImportsDataImporter* _tmp5_ = NULL; +#line 1515 "DataImportsPluginHost.c" + SpitDataImportsDataImporter* _tmp4_; + SpitDataImportsDataImporter* _tmp5_; #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1532,13 +1526,13 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp spit_data_imports_data_importer_stop (_tmp5_); #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp5_); -#line 1532 "DataImportsPluginHost.c" +#line 1526 "DataImportsPluginHost.c" } #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_clean_up (self); #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->importing_halted = TRUE; -#line 1538 "DataImportsPluginHost.c" +#line 1532 "DataImportsPluginHost.c" } @@ -1549,43 +1543,43 @@ static void spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImpor _g_object_unref0 (self->priv->progress_pane); #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->progress_pane = NULL; -#line 1549 "DataImportsPluginHost.c" +#line 1543 "DataImportsPluginHost.c" } void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self, SpitDataImportsPluginHostButtonMode mode) { - SpitDataImportsPluginHostButtonMode _tmp0_ = 0; + SpitDataImportsPluginHostButtonMode _tmp0_; #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_CONCRETE_DATA_IMPORTS_HOST (self)); #line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = mode; #line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp0_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE) { -#line 1561 "DataImportsPluginHost.c" - DataImportsUIDataImportsDialog* _tmp1_ = NULL; +#line 1555 "DataImportsPluginHost.c" + DataImportsUIDataImportsDialog* _tmp1_; #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp1_ = self->priv->dialog; #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp1_); -#line 1567 "DataImportsPluginHost.c" +#line 1561 "DataImportsPluginHost.c" } else { - SpitDataImportsPluginHostButtonMode _tmp2_ = 0; + SpitDataImportsPluginHostButtonMode _tmp2_; #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp2_ = mode; #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp2_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL) { -#line 1574 "DataImportsPluginHost.c" - DataImportsUIDataImportsDialog* _tmp3_ = NULL; +#line 1568 "DataImportsPluginHost.c" + DataImportsUIDataImportsDialog* _tmp3_; #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp3_ = self->priv->dialog; #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" data_imports_ui_data_imports_dialog_set_cancel_button_mode (_tmp3_); -#line 1580 "DataImportsPluginHost.c" +#line 1574 "DataImportsPluginHost.c" } else { #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_error ("DataImportsPluginHost.vala:138: unrecognized button mode enumeration v" \ "alue"); -#line 1584 "DataImportsPluginHost.c" +#line 1578 "DataImportsPluginHost.c" } } } @@ -1593,8 +1587,8 @@ void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImpor static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) { SpitDataImportsConcreteDataImportsHost * self; - GError* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + GError* _tmp0_; + const gchar* _tmp1_; #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1603,129 +1597,123 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDa _tmp1_ = _tmp0_->message; #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_); -#line 1602 "DataImportsPluginHost.c" +#line 1596 "DataImportsPluginHost.c" } static void spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) { SpitDataImportsConcreteDataImportsHost * self; gchar* msg = NULL; - const gchar* _tmp0_ = NULL; - SpitDataImportsDataImporter* _tmp1_ = NULL; - SpitDataImportsService* _tmp2_ = NULL; - SpitDataImportsService* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - DataImportsUIDataImportsDialog* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - DataImportsUIStaticMessagePane* _tmp17_ = NULL; - DataImportsUIStaticMessagePane* _tmp18_ = NULL; - DataImportsUIDataImportsDialog* _tmp19_ = NULL; - DataImportsUIDataImportsDialog* _tmp20_ = NULL; - SpitDataImportsDataImporter* _tmp21_ = NULL; - SpitDataImportsDataImporter* _tmp22_ = NULL; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsService* _tmp1_; + SpitDataImportsService* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + DataImportsUIDataImportsDialog* _tmp13_; + const gchar* _tmp14_; + DataImportsUIStaticMessagePane* _tmp15_; + DataImportsUIStaticMessagePane* _tmp16_; + DataImportsUIDataImportsDialog* _tmp17_; + DataImportsUIDataImportsDialog* _tmp18_; + SpitDataImportsDataImporter* _tmp19_; + SpitDataImportsDataImporter* _tmp20_; #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = _ ("Importing from %s can’t continue because an error occurred:"); -#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = self->priv->active_importer; + _tmp0_ = self->priv->active_importer; #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = spit_data_imports_data_importer_get_service (_tmp1_); + _tmp1_ = spit_data_imports_data_importer_get_service (_tmp0_); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = g_strdup_printf (_tmp0_, _tmp4_); + _tmp4_ = g_strdup_printf (_ ("Importing from %s can’t continue because an error occurred:"), _tmp3_); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - msg = _tmp6_; + msg = _tmp5_; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = msg; + _tmp6_ = msg; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = message; + _tmp7_ = message; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp9_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp8_); + _tmp8_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp7_); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp11_ = g_strconcat (_tmp7_, _tmp10_, NULL); + _tmp10_ = g_strconcat (_tmp6_, _tmp9_, NULL); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (msg); #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - msg = _tmp11_; + msg = _tmp10_; #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_free0 (_tmp10_); -#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp12_ = msg; + _g_free0 (_tmp9_); #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp13_ = _ ("To try importing from another service, select one from the above menu."); + _tmp11_ = msg; #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp14_ = g_strconcat (_tmp12_, _tmp13_, NULL); + _tmp12_ = g_strconcat (_tmp11_, _ ("To try importing from another service, select one from the above menu."), NULL); #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (msg); #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - msg = _tmp14_; + msg = _tmp12_; #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp15_ = self->priv->dialog; + _tmp13_ = self->priv->dialog; #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp16_ = msg; + _tmp14_ = msg; #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp17_ = data_imports_ui_static_message_pane_new_with_pango (_tmp16_); + _tmp15_ = data_imports_ui_static_message_pane_new_with_pango (_tmp14_); #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_install_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); + data_imports_ui_data_imports_dialog_install_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp16_); #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp19_ = self->priv->dialog; + _tmp17_ = self->priv->dialog; #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp19_); + data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp17_); #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp20_ = self->priv->dialog; + _tmp18_ = self->priv->dialog; #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - data_imports_ui_data_imports_dialog_unlock_service (_tmp20_); + data_imports_ui_data_imports_dialog_unlock_service (_tmp18_); #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp21_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp19_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_data_importer_stop (_tmp22_); + spit_data_imports_data_importer_stop (_tmp20_); #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp22_); + _g_object_unref0 (_tmp20_); #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_clean_up (self); #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (msg); -#line 1712 "DataImportsPluginHost.c" +#line 1700 "DataImportsPluginHost.c" } static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode) { SpitDataImportsConcreteDataImportsHost * self; gboolean _tmp0_ = FALSE; - SpitDataImportsDataImporter* _tmp1_ = NULL; - SpitDataImportsDataImporter* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - DataImportsUIDataImportsDialog* _tmp7_ = NULL; - SpitDataImportsDialogPane* _tmp8_ = NULL; - SpitDataImportsPluginHostButtonMode _tmp9_ = 0; + SpitDataImportsDataImporter* _tmp1_; + SpitDataImportsDataImporter* _tmp2_; + gboolean _tmp3_; + DataImportsUIDataImportsDialog* _tmp7_; + SpitDataImportsDialogPane* _tmp8_; + SpitDataImportsPluginHostButtonMode _tmp9_; #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1745,11 +1733,11 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan if (_tmp3_) { #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = TRUE; -#line 1743 "DataImportsPluginHost.c" +#line 1731 "DataImportsPluginHost.c" } else { - SpitDataImportsDataImporter* _tmp4_ = NULL; - SpitDataImportsDataImporter* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + SpitDataImportsDataImporter* _tmp4_; + SpitDataImportsDataImporter* _tmp5_; + gboolean _tmp6_; #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1760,13 +1748,13 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan _tmp0_ = !_tmp6_; #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp5_); -#line 1758 "DataImportsPluginHost.c" +#line 1746 "DataImportsPluginHost.c" } #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp0_) { #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return; -#line 1764 "DataImportsPluginHost.c" +#line 1752 "DataImportsPluginHost.c" } #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp7_ = self->priv->dialog; @@ -1778,17 +1766,17 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan _tmp9_ = button_mode; #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_set_button_mode (self, _tmp9_); -#line 1776 "DataImportsPluginHost.c" +#line 1764 "DataImportsPluginHost.c" } static void spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode) { SpitDataImportsConcreteDataImportsHost * self; - SpitDataImportsPluginHostButtonMode _tmp0_ = 0; - DataImportsUIDataImportsDialog* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - DataImportsUIStaticMessagePane* _tmp3_ = NULL; - DataImportsUIStaticMessagePane* _tmp4_ = NULL; + SpitDataImportsPluginHostButtonMode _tmp0_; + DataImportsUIDataImportsDialog* _tmp1_; + const gchar* _tmp2_; + DataImportsUIStaticMessagePane* _tmp3_; + DataImportsUIStaticMessagePane* _tmp4_; #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1809,15 +1797,15 @@ static void spit_data_imports_concrete_data_imports_host_real_install_static_mes data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp4_); -#line 1807 "DataImportsPluginHost.c" +#line 1795 "DataImportsPluginHost.c" } static void spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) { SpitDataImportsConcreteDataImportsHost * self; gboolean _tmp0_ = FALSE; - SpitDataImportsImportableLibrary** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitDataImportsImportableLibrary** _tmp1_; + gint _tmp1__length1; #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1828,31 +1816,31 @@ static void spit_data_imports_concrete_data_imports_host_real_install_library_se _tmp1__length1 = discovered_libraries_length1; #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp1__length1 == 0) { -#line 1826 "DataImportsPluginHost.c" - const gchar* _tmp2_ = NULL; +#line 1814 "DataImportsPluginHost.c" + const gchar* _tmp2_; #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp2_ = file_select_label; #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = _tmp2_ == NULL; -#line 1832 "DataImportsPluginHost.c" +#line 1820 "DataImportsPluginHost.c" } else { #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = FALSE; -#line 1836 "DataImportsPluginHost.c" +#line 1824 "DataImportsPluginHost.c" } #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp0_) { #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), "Libraries or file option needed"); -#line 1842 "DataImportsPluginHost.c" +#line 1830 "DataImportsPluginHost.c" } else { - DataImportsUIDataImportsDialog* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - SpitDataImportsImportableLibrary** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - const gchar* _tmp6_ = NULL; - DataImportsUILibrarySelectionPane* _tmp7_ = NULL; - DataImportsUILibrarySelectionPane* _tmp8_ = NULL; + DataImportsUIDataImportsDialog* _tmp3_; + const gchar* _tmp4_; + SpitDataImportsImportableLibrary** _tmp5_; + gint _tmp5__length1; + const gchar* _tmp6_; + DataImportsUILibrarySelectionPane* _tmp7_; + DataImportsUILibrarySelectionPane* _tmp8_; #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp3_ = self->priv->dialog; #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1871,22 +1859,22 @@ static void spit_data_imports_concrete_data_imports_host_real_install_library_se data_imports_ui_data_imports_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane)); #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp8_); -#line 1869 "DataImportsPluginHost.c" +#line 1857 "DataImportsPluginHost.c" } #line 199 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE); -#line 1873 "DataImportsPluginHost.c" +#line 1861 "DataImportsPluginHost.c" } static void spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message) { SpitDataImportsConcreteDataImportsHost * self; - const gchar* _tmp0_ = NULL; - DataImportsUIProgressPane* _tmp1_ = NULL; - DataImportsUIDataImportsDialog* _tmp2_ = NULL; - DataImportsUIProgressPane* _tmp3_ = NULL; - SpitDataImportsCoreImporter* _tmp4_ = NULL; - SpitDataImportsCoreImporter* _tmp5_ = NULL; + const gchar* _tmp0_; + DataImportsUIProgressPane* _tmp1_; + DataImportsUIDataImportsDialog* _tmp2_; + DataImportsUIProgressPane* _tmp3_; + SpitDataImportsCoreImporter* _tmp4_; + SpitDataImportsCoreImporter* _tmp5_; #line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1917,23 +1905,23 @@ static void spit_data_imports_concrete_data_imports_host_real_install_import_pro _batch_import_roll_unref0 (_tmp5_->current_import_roll); #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp5_->current_import_roll = NULL; -#line 1915 "DataImportsPluginHost.c" +#line 1903 "DataImportsPluginHost.c" } static void spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message) { SpitDataImportsConcreteDataImportsHost * self; - DataImportsUIProgressPane* _tmp0_ = NULL; + DataImportsUIProgressPane* _tmp0_; #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = self->priv->progress_pane; #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp0_ != NULL) { -#line 1928 "DataImportsPluginHost.c" - DataImportsUIProgressPane* _tmp1_ = NULL; - gdouble _tmp2_ = 0.0; - const gchar* _tmp3_ = NULL; +#line 1916 "DataImportsPluginHost.c" + DataImportsUIProgressPane* _tmp1_; + gdouble _tmp2_; + const gchar* _tmp3_; #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp1_ = self->priv->progress_pane; #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1942,19 +1930,19 @@ static void spit_data_imports_concrete_data_imports_host_real_update_import_prog _tmp3_ = progress_message; #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" data_imports_ui_progress_pane_update_progress (_tmp1_, _tmp2_, _tmp3_); -#line 1940 "DataImportsPluginHost.c" +#line 1928 "DataImportsPluginHost.c" } } static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) { SpitDataImportsConcreteDataImportsHost * self; - SpitDataImportsCoreImporter* _tmp0_ = NULL; - SpitDataImportsImportableMediaItem** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gdouble _tmp2_ = 0.0; - gdouble _tmp3_ = 0.0; - const gchar* _tmp4_ = NULL; + SpitDataImportsCoreImporter* _tmp0_; + SpitDataImportsImportableMediaItem** _tmp1_; + gint _tmp1__length1; + gdouble _tmp2_; + gdouble _tmp3_; + const gchar* _tmp4_; #line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1971,20 +1959,20 @@ static void spit_data_imports_concrete_data_imports_host_real_prepare_media_item _tmp4_ = progress_message; #line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_); -#line 1969 "DataImportsPluginHost.c" +#line 1957 "DataImportsPluginHost.c" } static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) { SpitDataImportsConcreteDataImportsHost * self; - const gchar* _tmp0_ = NULL; - SpitDataImportsCoreImporter* _tmp1_ = NULL; - SpitDataImportsImportedItemsCountCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - SpitDataImportsCoreImporter* _tmp3_ = NULL; - gint _tmp4_ = 0; - SpitDataImportsCoreImporter* _tmp5_ = NULL; - gint _tmp6_ = 0; + const gchar* _tmp0_; + SpitDataImportsCoreImporter* _tmp1_; + SpitDataImportsImportedItemsCountCallback _tmp2_; + void* _tmp2__target; + SpitDataImportsCoreImporter* _tmp3_; + gint _tmp4_; + SpitDataImportsCoreImporter* _tmp5_; + gint _tmp6_; #line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); #line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2013,9 +2001,9 @@ static void spit_data_imports_concrete_data_imports_host_real_finalize_import (S _tmp6_ = _tmp5_->imported_items_count; #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp6_ > 0) { -#line 2011 "DataImportsPluginHost.c" - LibraryWindow* _tmp7_ = NULL; - LibraryWindow* _tmp8_ = NULL; +#line 1999 "DataImportsPluginHost.c" + LibraryWindow* _tmp7_; + LibraryWindow* _tmp8_; #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp7_ = library_window_get_app (); #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2024,7 +2012,7 @@ static void spit_data_imports_concrete_data_imports_host_real_finalize_import (S library_window_switch_to_import_queue_page (_tmp8_); #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp8_); -#line 2022 "DataImportsPluginHost.c" +#line 2010 "DataImportsPluginHost.c" } } @@ -2036,7 +2024,7 @@ static void spit_data_imports_concrete_data_imports_host_class_init (SpitDataImp g_type_class_add_private (klass, sizeof (SpitDataImportsConcreteDataImportsHostPrivate)); #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (klass)->finalize = spit_data_imports_concrete_data_imports_host_finalize; -#line 2034 "DataImportsPluginHost.c" +#line 2022 "DataImportsPluginHost.c" } @@ -2044,30 +2032,30 @@ static void spit_data_imports_concrete_data_imports_host_spit_data_imports_plugi #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface); #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->get_data_importer = (SpitDataImportsDataImporter* (*)(SpitDataImportsPluginHost*)) spit_data_imports_concrete_data_imports_host_real_get_data_importer; + iface->get_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsPluginHost *)) spit_data_imports_concrete_data_imports_host_real_get_data_importer; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->start_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_concrete_data_imports_host_real_start_importing; + iface->start_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_concrete_data_imports_host_real_start_importing; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->stop_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_concrete_data_imports_host_real_stop_importing; + iface->stop_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_concrete_data_imports_host_real_stop_importing; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->post_error = (void (*)(SpitDataImportsPluginHost*, GError*)) spit_data_imports_concrete_data_imports_host_real_post_error; + iface->post_error = (void (*) (SpitDataImportsPluginHost *, GError*)) spit_data_imports_concrete_data_imports_host_real_post_error; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->post_error_message = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_post_error_message; + iface->post_error_message = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_concrete_data_imports_host_real_post_error_message; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->install_dialog_pane = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_dialog_pane; + iface->install_dialog_pane = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_dialog_pane; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->install_static_message_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_static_message_pane; + iface->install_static_message_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_concrete_data_imports_host_real_install_static_message_pane; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->install_library_selection_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane; + iface->install_library_selection_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->install_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane; + iface->install_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->update_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane; + iface->update_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->prepare_media_items_for_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import; + iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->finalize_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_finalize_import; -#line 2065 "DataImportsPluginHost.c" + iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_finalize_import; +#line 2053 "DataImportsPluginHost.c" } @@ -2082,11 +2070,11 @@ static void spit_data_imports_concrete_data_imports_host_instance_init (SpitData self->priv->progress_pane = NULL; #line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->importing_halted = FALSE; -#line 2080 "DataImportsPluginHost.c" +#line 2068 "DataImportsPluginHost.c" } -static void spit_data_imports_concrete_data_imports_host_finalize (GObject* obj) { +static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj) { SpitDataImportsConcreteDataImportsHost * self; #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost); @@ -2098,7 +2086,7 @@ static void spit_data_imports_concrete_data_imports_host_finalize (GObject* obj) _spit_data_imports_core_importer_unref0 (self->priv->core_importer); #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (spit_data_imports_concrete_data_imports_host_parent_class)->finalize (obj); -#line 2096 "DataImportsPluginHost.c" +#line 2084 "DataImportsPluginHost.c" } @@ -2118,11 +2106,11 @@ GType spit_data_imports_concrete_data_imports_host_get_type (void) { SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) { SpitDataImportsWelcomeDataImportsHost * self = NULL; - SpitDataImportsService* _tmp0_ = NULL; - SpitDataImportsService* _tmp1_ = NULL; - SpitDataImportsDataImporter* _tmp2_ = NULL; - SpitDataImportsCoreImporter* _tmp3_ = NULL; - SpitDataImportsWelcomeImportMetaHost* _tmp4_ = NULL; + SpitDataImportsService* _tmp0_; + SpitDataImportsService* _tmp1_; + SpitDataImportsDataImporter* _tmp2_; + SpitDataImportsCoreImporter* _tmp3_; + SpitDataImportsWelcomeImportMetaHost* _tmp4_; #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL); #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2151,22 +2139,22 @@ SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_ho self->priv->meta_host = _tmp4_; #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self; -#line 2149 "DataImportsPluginHost.c" +#line 2137 "DataImportsPluginHost.c" } SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) { #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return spit_data_imports_welcome_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, service, meta_host); -#line 2156 "DataImportsPluginHost.c" +#line 2144 "DataImportsPluginHost.c" } static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) { SpitDataImportsWelcomeDataImportsHost * self; SpitDataImportsDataImporter* result = NULL; - SpitDataImportsDataImporter* _tmp0_ = NULL; - SpitDataImportsDataImporter* _tmp1_ = NULL; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsDataImporter* _tmp1_; #line 260 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 261 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2177,18 +2165,18 @@ static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_ result = _tmp1_; #line 261 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 2175 "DataImportsPluginHost.c" +#line 2163 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) { SpitDataImportsWelcomeDataImportsHost * self; - SpitDataImportsDataImporter* _tmp0_ = NULL; - SpitDataImportsDataImporter* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - SpitDataImportsDataImporter* _tmp4_ = NULL; - SpitDataImportsDataImporter* _tmp5_ = NULL; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsDataImporter* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; + SpitDataImportsDataImporter* _tmp4_; + SpitDataImportsDataImporter* _tmp5_; #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2205,7 +2193,7 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp if (_tmp3_) { #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return; -#line 2203 "DataImportsPluginHost.c" +#line 2191 "DataImportsPluginHost.c" } #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_debug ("DataImportsPluginHost.vala:268: WelcomeDataImportsHost.start_importing" \ @@ -2218,16 +2206,16 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp spit_data_imports_data_importer_start (_tmp5_); #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp5_); -#line 2215 "DataImportsPluginHost.c" +#line 2203 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) { SpitDataImportsWelcomeDataImportsHost * self; - SpitDataImportsDataImporter* _tmp0_ = NULL; - SpitDataImportsDataImporter* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsDataImporter* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 273 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 274 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2245,9 +2233,9 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi _g_object_unref0 (_tmp1_); #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp3_) { -#line 2241 "DataImportsPluginHost.c" - SpitDataImportsDataImporter* _tmp4_ = NULL; - SpitDataImportsDataImporter* _tmp5_ = NULL; +#line 2229 "DataImportsPluginHost.c" + SpitDataImportsDataImporter* _tmp4_; + SpitDataImportsDataImporter* _tmp5_; #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2256,27 +2244,27 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi spit_data_imports_data_importer_stop (_tmp5_); #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp5_); -#line 2252 "DataImportsPluginHost.c" +#line 2240 "DataImportsPluginHost.c" } #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_data_imports_host_clean_up (self); #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->importing_halted = TRUE; -#line 2258 "DataImportsPluginHost.c" +#line 2246 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self) { #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_DATA_IMPORTS_HOST (self)); -#line 2265 "DataImportsPluginHost.c" +#line 2253 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) { SpitDataImportsWelcomeDataImportsHost * self; - GError* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + GError* _tmp0_; + const gchar* _tmp1_; #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2285,59 +2273,56 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDat _tmp1_ = _tmp0_->message; #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_); -#line 2281 "DataImportsPluginHost.c" +#line 2269 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) { SpitDataImportsWelcomeDataImportsHost * self; gchar* msg = NULL; - const gchar* _tmp0_ = NULL; - SpitDataImportsDataImporter* _tmp1_ = NULL; - SpitDataImportsService* _tmp2_ = NULL; - SpitDataImportsService* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - SpitDataImportsDataImporter* _tmp7_ = NULL; - SpitDataImportsDataImporter* _tmp8_ = NULL; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsService* _tmp1_; + SpitDataImportsService* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + SpitDataImportsDataImporter* _tmp6_; + SpitDataImportsDataImporter* _tmp7_; #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = _ ("Importing from %s can’t continue because an error occurred:"); -#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp1_ = self->priv->active_importer; + _tmp0_ = self->priv->active_importer; #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp2_ = spit_data_imports_data_importer_get_service (_tmp1_); + _tmp1_ = spit_data_imports_data_importer_get_service (_tmp0_); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = g_strdup_printf (_tmp0_, _tmp4_); + _tmp4_ = g_strdup_printf (_ ("Importing from %s can’t continue because an error occurred:"), _tmp3_); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - msg = _tmp6_; + msg = _tmp5_; #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_debug ("DataImportsPluginHost.vala:297: %s", msg); #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp7_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); + _tmp6_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - spit_data_imports_data_importer_stop (_tmp8_); + spit_data_imports_data_importer_stop (_tmp7_); #line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_data_imports_host_clean_up (self); #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_free0 (msg); -#line 2333 "DataImportsPluginHost.c" +#line 2318 "DataImportsPluginHost.c" } @@ -2347,7 +2332,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane)); -#line 2343 "DataImportsPluginHost.c" +#line 2328 "DataImportsPluginHost.c" } @@ -2357,21 +2342,21 @@ static void spit_data_imports_welcome_data_imports_host_real_install_static_mess self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); -#line 2353 "DataImportsPluginHost.c" +#line 2338 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) { SpitDataImportsWelcomeDataImportsHost * self; - SpitDataImportsDataImporter* _tmp0_ = NULL; - SpitDataImportsDataImporter* _tmp1_ = NULL; - SpitDataImportsService* _tmp2_ = NULL; - SpitDataImportsService* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - SpitDataImportsImportableLibrary** _tmp7_ = NULL; - gint _tmp7__length1 = 0; + SpitDataImportsDataImporter* _tmp0_; + SpitDataImportsDataImporter* _tmp1_; + SpitDataImportsService* _tmp2_; + SpitDataImportsService* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + SpitDataImportsImportableLibrary** _tmp7_; + gint _tmp7__length1; #line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2404,17 +2389,17 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel _tmp7__length1 = discovered_libraries_length1; #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp7__length1 > 0) { -#line 2400 "DataImportsPluginHost.c" - SpitDataImportsWelcomeImportMetaHost* _tmp8_ = NULL; - SpitDataImportsDataImporter* _tmp9_ = NULL; - SpitDataImportsDataImporter* _tmp10_ = NULL; - SpitDataImportsService* _tmp11_ = NULL; - SpitDataImportsService* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - SpitDataImportsImportableLibrary** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - SpitDataImportsWelcomeImportServiceEntry* _tmp15_ = NULL; - SpitDataImportsWelcomeImportServiceEntry* _tmp16_ = NULL; +#line 2385 "DataImportsPluginHost.c" + SpitDataImportsWelcomeImportMetaHost* _tmp8_; + SpitDataImportsDataImporter* _tmp9_; + SpitDataImportsDataImporter* _tmp10_; + SpitDataImportsService* _tmp11_; + SpitDataImportsService* _tmp12_; + const gchar* _tmp13_; + SpitDataImportsImportableLibrary** _tmp14_; + gint _tmp14__length1; + SpitDataImportsWelcomeImportServiceEntry* _tmp15_; + SpitDataImportsWelcomeImportServiceEntry* _tmp16_; #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp8_ = self->priv->meta_host; #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2443,7 +2428,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel _g_object_unref0 (_tmp12_); #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_tmp10_); -#line 2439 "DataImportsPluginHost.c" +#line 2424 "DataImportsPluginHost.c" } } @@ -2454,7 +2439,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_import_prog self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); -#line 2450 "DataImportsPluginHost.c" +#line 2435 "DataImportsPluginHost.c" } @@ -2462,18 +2447,18 @@ static void spit_data_imports_welcome_data_imports_host_real_update_import_progr SpitDataImportsWelcomeDataImportsHost * self; #line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); -#line 2458 "DataImportsPluginHost.c" +#line 2443 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) { SpitDataImportsWelcomeDataImportsHost * self; - SpitDataImportsCoreImporter* _tmp0_ = NULL; - SpitDataImportsImportableMediaItem** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gdouble _tmp2_ = 0.0; - gdouble _tmp3_ = 0.0; - const gchar* _tmp4_ = NULL; + SpitDataImportsCoreImporter* _tmp0_; + SpitDataImportsImportableMediaItem** _tmp1_; + gint _tmp1__length1; + gdouble _tmp2_; + gdouble _tmp3_; + const gchar* _tmp4_; #line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2490,18 +2475,18 @@ static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items _tmp4_ = progress_message; #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_); -#line 2486 "DataImportsPluginHost.c" +#line 2471 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) { SpitDataImportsWelcomeDataImportsHost * self; - SpitDataImportsCoreImporter* _tmp0_ = NULL; - SpitDataImportsImportedItemsCountCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - SpitDataImportsCoreImporter* _tmp2_ = NULL; - gint _tmp3_ = 0; - SpitDataImportsWelcomeImportMetaHost* _tmp4_ = NULL; + SpitDataImportsCoreImporter* _tmp0_; + SpitDataImportsImportedItemsCountCallback _tmp1_; + void* _tmp1__target; + SpitDataImportsCoreImporter* _tmp2_; + gint _tmp3_; + SpitDataImportsWelcomeImportMetaHost* _tmp4_; #line 354 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); #line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2522,7 +2507,7 @@ static void spit_data_imports_welcome_data_imports_host_real_finalize_import (Sp _tmp4_ = self->priv->meta_host; #line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_import_meta_host_finalize_import (_tmp4_, self); -#line 2518 "DataImportsPluginHost.c" +#line 2503 "DataImportsPluginHost.c" } @@ -2533,7 +2518,7 @@ static void spit_data_imports_welcome_data_imports_host_class_init (SpitDataImpo g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeDataImportsHostPrivate)); #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_data_imports_host_finalize; -#line 2529 "DataImportsPluginHost.c" +#line 2514 "DataImportsPluginHost.c" } @@ -2541,30 +2526,30 @@ static void spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface); #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->get_data_importer = (SpitDataImportsDataImporter* (*)(SpitDataImportsPluginHost*)) spit_data_imports_welcome_data_imports_host_real_get_data_importer; + iface->get_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsPluginHost *)) spit_data_imports_welcome_data_imports_host_real_get_data_importer; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->start_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_welcome_data_imports_host_real_start_importing; + iface->start_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_welcome_data_imports_host_real_start_importing; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->stop_importing = (void (*)(SpitDataImportsPluginHost*)) spit_data_imports_welcome_data_imports_host_real_stop_importing; + iface->stop_importing = (void (*) (SpitDataImportsPluginHost *)) spit_data_imports_welcome_data_imports_host_real_stop_importing; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->post_error = (void (*)(SpitDataImportsPluginHost*, GError*)) spit_data_imports_welcome_data_imports_host_real_post_error; + iface->post_error = (void (*) (SpitDataImportsPluginHost *, GError*)) spit_data_imports_welcome_data_imports_host_real_post_error; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->post_error_message = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_post_error_message; + iface->post_error_message = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_welcome_data_imports_host_real_post_error_message; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->install_dialog_pane = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_dialog_pane; + iface->install_dialog_pane = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsDialogPane*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_dialog_pane; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->install_static_message_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_static_message_pane; + iface->install_static_message_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsPluginHostButtonMode)) spit_data_imports_welcome_data_imports_host_real_install_static_message_pane; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->install_library_selection_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane; + iface->install_library_selection_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*, SpitDataImportsImportableLibrary**, int, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->install_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane; + iface->install_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, const gchar*)) spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->update_import_progress_pane = (void (*)(SpitDataImportsPluginHost*, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane; + iface->update_import_progress_pane = (void (*) (SpitDataImportsPluginHost *, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->prepare_media_items_for_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import; + iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->finalize_import = (void (*)(SpitDataImportsPluginHost*, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_finalize_import; -#line 2560 "DataImportsPluginHost.c" + iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_finalize_import; +#line 2545 "DataImportsPluginHost.c" } @@ -2575,11 +2560,11 @@ static void spit_data_imports_welcome_data_imports_host_instance_init (SpitDataI self->priv->active_importer = NULL; #line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv->importing_halted = FALSE; -#line 2571 "DataImportsPluginHost.c" +#line 2556 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_data_imports_host_finalize (GObject* obj) { +static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj) { SpitDataImportsWelcomeDataImportsHost * self; #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost); @@ -2589,7 +2574,7 @@ static void spit_data_imports_welcome_data_imports_host_finalize (GObject* obj) _spit_data_imports_core_importer_unref0 (self->priv->core_importer); #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (spit_data_imports_welcome_data_imports_host_parent_class)->finalize (obj); -#line 2585 "DataImportsPluginHost.c" +#line 2570 "DataImportsPluginHost.c" } @@ -2614,30 +2599,30 @@ static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImpo result = g_new0 (SpitDataImportsImportableLibrary*, length + 1); #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" for (i = 0; i < length; i++) { -#line 2610 "DataImportsPluginHost.c" - SpitDataImportsImportableLibrary* _tmp0_ = NULL; +#line 2595 "DataImportsPluginHost.c" + SpitDataImportsImportableLibrary* _tmp0_; #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" result[i] = _tmp0_; -#line 2616 "DataImportsPluginHost.c" +#line 2601 "DataImportsPluginHost.c" } #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 2620 "DataImportsPluginHost.c" +#line 2605 "DataImportsPluginHost.c" } SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) { SpitDataImportsWelcomeImportServiceEntry * self = NULL; - SpitDataImportsPluginHost* _tmp0_ = NULL; - SpitDataImportsPluginHost* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - SpitDataImportsImportableLibrary** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - SpitDataImportsImportableLibrary** _tmp5_ = NULL; - gint _tmp5__length1 = 0; + SpitDataImportsPluginHost* _tmp0_; + SpitDataImportsPluginHost* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + SpitDataImportsImportableLibrary** _tmp4_; + gint _tmp4__length1; + SpitDataImportsImportableLibrary** _tmp5_; + gint _tmp5__length1; #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL); #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2678,22 +2663,22 @@ SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_servi self->priv->_discovered_libraries_size_ = self->priv->discovered_libraries_length1; #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self; -#line 2674 "DataImportsPluginHost.c" +#line 2659 "DataImportsPluginHost.c" } SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) { #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return spit_data_imports_welcome_import_service_entry_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, host, pluggable_name, discovered_libraries, discovered_libraries_length1); -#line 2681 "DataImportsPluginHost.c" +#line 2666 "DataImportsPluginHost.c" } static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base) { SpitDataImportsWelcomeImportServiceEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry); #line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2704,21 +2689,21 @@ static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_na result = _tmp1_; #line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 2700 "DataImportsPluginHost.c" +#line 2685 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base) { SpitDataImportsWelcomeImportServiceEntry * self; - SpitDataImportsImportableLibrary** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + SpitDataImportsImportableLibrary** _tmp0_; + gint _tmp0__length1; #line 385 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry); #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = self->priv->discovered_libraries; #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0__length1 = self->priv->discovered_libraries_length1; -#line 2714 "DataImportsPluginHost.c" +#line 2699 "DataImportsPluginHost.c" { SpitDataImportsImportableLibrary** library_collection = NULL; gint library_collection_length1 = 0; @@ -2730,19 +2715,19 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome library_collection_length1 = _tmp0__length1; #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" for (library_it = 0; library_it < _tmp0__length1; library_it = library_it + 1) { -#line 2726 "DataImportsPluginHost.c" - SpitDataImportsImportableLibrary* _tmp1_ = NULL; +#line 2711 "DataImportsPluginHost.c" + SpitDataImportsImportableLibrary* _tmp1_; SpitDataImportsImportableLibrary* library = NULL; #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp1_ = _g_object_ref0 (library_collection[library_it]); #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" library = _tmp1_; -#line 2733 "DataImportsPluginHost.c" +#line 2718 "DataImportsPluginHost.c" { - SpitDataImportsPluginHost* _tmp2_ = NULL; - SpitDataImportsDataImporter* _tmp3_ = NULL; - SpitDataImportsDataImporter* _tmp4_ = NULL; - SpitDataImportsImportableLibrary* _tmp5_ = NULL; + SpitDataImportsPluginHost* _tmp2_; + SpitDataImportsDataImporter* _tmp3_; + SpitDataImportsDataImporter* _tmp4_; + SpitDataImportsImportableLibrary* _tmp5_; #line 387 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp2_ = self->priv->host; #line 387 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2757,7 +2742,7 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome _g_object_unref0 (_tmp4_); #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (library); -#line 2753 "DataImportsPluginHost.c" +#line 2738 "DataImportsPluginHost.c" } } } @@ -2771,7 +2756,7 @@ static void spit_data_imports_welcome_import_service_entry_class_init (SpitDataI g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportServiceEntryPrivate)); #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_service_entry_finalize; -#line 2767 "DataImportsPluginHost.c" +#line 2752 "DataImportsPluginHost.c" } @@ -2779,21 +2764,21 @@ static void spit_data_imports_welcome_import_service_entry_welcome_service_entry #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = g_type_interface_peek_parent (iface); #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->get_service_name = (gchar* (*)(WelcomeServiceEntry*)) spit_data_imports_welcome_import_service_entry_real_get_service_name; + iface->get_service_name = (gchar* (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_get_service_name; #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - iface->execute = (void (*)(WelcomeServiceEntry*)) spit_data_imports_welcome_import_service_entry_real_execute; -#line 2778 "DataImportsPluginHost.c" + iface->execute = (void (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_execute; +#line 2763 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_import_service_entry_instance_init (SpitDataImportsWelcomeImportServiceEntry * self) { #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE (self); -#line 2785 "DataImportsPluginHost.c" +#line 2770 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_import_service_entry_finalize (GObject* obj) { +static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj) { SpitDataImportsWelcomeImportServiceEntry * self; #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry); @@ -2805,7 +2790,7 @@ static void spit_data_imports_welcome_import_service_entry_finalize (GObject* ob _g_object_unref0 (self->priv->host); #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (spit_data_imports_welcome_import_service_entry_parent_class)->finalize (obj); -#line 2801 "DataImportsPluginHost.c" +#line 2786 "DataImportsPluginHost.c" } @@ -2825,8 +2810,8 @@ GType spit_data_imports_welcome_import_service_entry_get_type (void) { SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog) { SpitDataImportsWelcomeImportMetaHost * self = NULL; - WelcomeDialog* _tmp0_ = NULL; - WelcomeDialog* _tmp1_ = NULL; + WelcomeDialog* _tmp0_; + WelcomeDialog* _tmp1_; #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_val_if_fail (IS_WELCOME_DIALOG (dialog), NULL); #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2841,25 +2826,25 @@ SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host self->priv->dialog = _tmp1_; #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return self; -#line 2837 "DataImportsPluginHost.c" +#line 2822 "DataImportsPluginHost.c" } SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog) { #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return spit_data_imports_welcome_import_meta_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, dialog); -#line 2844 "DataImportsPluginHost.c" +#line 2829 "DataImportsPluginHost.c" } void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self) { SpitDataImportsService** services = NULL; - gint _tmp0_ = 0; - SpitDataImportsService** _tmp1_ = NULL; - gint services_length1 = 0; - gint _services_size_ = 0; - SpitDataImportsService** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gint _tmp0_; + SpitDataImportsService** _tmp1_; + gint services_length1; + gint _services_size_; + SpitDataImportsService** _tmp2_; + gint _tmp2__length1; #line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self)); #line 400 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2874,7 +2859,7 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp _tmp2_ = services; #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp2__length1 = services_length1; -#line 2870 "DataImportsPluginHost.c" +#line 2855 "DataImportsPluginHost.c" { SpitDataImportsService** service_collection = NULL; gint service_collection_length1 = 0; @@ -2886,19 +2871,19 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp service_collection_length1 = _tmp2__length1; #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" for (service_it = 0; service_it < _tmp2__length1; service_it = service_it + 1) { -#line 2882 "DataImportsPluginHost.c" - SpitDataImportsService* _tmp3_ = NULL; +#line 2867 "DataImportsPluginHost.c" + SpitDataImportsService* _tmp3_; SpitDataImportsService* service = NULL; #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp3_ = _g_object_ref0 (service_collection[service_it]); #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" service = _tmp3_; -#line 2889 "DataImportsPluginHost.c" +#line 2874 "DataImportsPluginHost.c" { SpitDataImportsWelcomeDataImportsHost* host = NULL; - SpitDataImportsService* _tmp4_ = NULL; - SpitDataImportsWelcomeDataImportsHost* _tmp5_ = NULL; - SpitDataImportsWelcomeDataImportsHost* _tmp6_ = NULL; + SpitDataImportsService* _tmp4_; + SpitDataImportsWelcomeDataImportsHost* _tmp5_; + SpitDataImportsWelcomeDataImportsHost* _tmp6_; #line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp4_ = service; #line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2913,18 +2898,18 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp _g_object_unref0 (host); #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (service); -#line 2909 "DataImportsPluginHost.c" +#line 2894 "DataImportsPluginHost.c" } } } #line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL); -#line 2915 "DataImportsPluginHost.c" +#line 2900 "DataImportsPluginHost.c" } void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host) { - SpitDataImportsWelcomeDataImportsHost* _tmp0_ = NULL; + SpitDataImportsWelcomeDataImportsHost* _tmp0_; #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self)); #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2933,18 +2918,18 @@ void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImports _tmp0_ = host; #line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost)); -#line 2929 "DataImportsPluginHost.c" +#line 2914 "DataImportsPluginHost.c" } void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self, WelcomeServiceEntry* entry) { - WelcomeServiceEntry* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - WelcomeDialog* _tmp5_ = NULL; - WelcomeServiceEntry* _tmp6_ = NULL; + WelcomeServiceEntry* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + WelcomeDialog* _tmp5_; + WelcomeServiceEntry* _tmp6_; #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self)); #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2971,7 +2956,7 @@ void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataI _tmp6_ = entry; #line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" welcome_dialog_install_service_entry (_tmp5_, _tmp6_); -#line 2967 "DataImportsPluginHost.c" +#line 2952 "DataImportsPluginHost.c" } @@ -2982,18 +2967,18 @@ static void spit_data_imports_welcome_import_meta_host_class_init (SpitDataImpor g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportMetaHostPrivate)); #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_meta_host_finalize; -#line 2978 "DataImportsPluginHost.c" +#line 2963 "DataImportsPluginHost.c" } static void spit_data_imports_welcome_import_meta_host_instance_init (SpitDataImportsWelcomeImportMetaHost * self) { #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE (self); -#line 2985 "DataImportsPluginHost.c" +#line 2970 "DataImportsPluginHost.c" } -static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj) { +static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj) { SpitDataImportsWelcomeImportMetaHost * self; #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHost); @@ -3001,7 +2986,7 @@ static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj) { _g_object_unref0 (self->priv->dialog); #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" G_OBJECT_CLASS (spit_data_imports_welcome_import_meta_host_parent_class)->finalize (obj); -#line 2997 "DataImportsPluginHost.c" +#line 2982 "DataImportsPluginHost.c" } @@ -3019,10 +3004,10 @@ GType spit_data_imports_welcome_import_meta_host_get_type (void) { SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1) { SpitDataImportsService** result = NULL; - gint _tmp0_ = 0; - SpitDataImportsService** _tmp1_ = NULL; - SpitDataImportsService** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gint _tmp0_; + SpitDataImportsService** _tmp1_; + SpitDataImportsService** _tmp2_; + gint _tmp2__length1; #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp1_ = spit_data_imports_load_services (TRUE, &_tmp0_); #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3033,40 +3018,40 @@ SpitDataImportsService** spit_data_imports_load_all_services (int* result_length if (result_length1) { #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *result_length1 = _tmp2__length1; -#line 3029 "DataImportsPluginHost.c" +#line 3014 "DataImportsPluginHost.c" } #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" result = _tmp2_; #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3035 "DataImportsPluginHost.c" +#line 3020 "DataImportsPluginHost.c" } -static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value) { +static void _vala_array_add69 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value) { #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if ((*length) == (*size)) { #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *size = (*size) ? (2 * (*size)) : 4; #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *array = g_renew (SpitDataImportsService*, *array, (*size) + 1); -#line 3046 "DataImportsPluginHost.c" +#line 3031 "DataImportsPluginHost.c" } #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" (*array)[(*length)++] = value; #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" (*array)[*length] = NULL; -#line 3052 "DataImportsPluginHost.c" +#line 3037 "DataImportsPluginHost.c" } -static gint __lambda22_ (void* a, void* b) { +static gint __lambda23_ (void* a, void* b) { gint result = 0; - void* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - void* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; + void* _tmp0_; + const gchar* _tmp1_; + void* _tmp2_; + const gchar* _tmp3_; + gint _tmp4_; #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = a; #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3081,37 +3066,37 @@ static gint __lambda22_ (void* a, void* b) { result = _tmp4_; #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3077 "DataImportsPluginHost.c" +#line 3062 "DataImportsPluginHost.c" } -static gint ___lambda22____compar_fn_t (void* key1, void* key2) { +static gint ___lambda23____compar_fn_t (void* key1, void* key2) { gint result; - result = __lambda22_ (key1, key2); + result = __lambda23_ (key1, key2); #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3086 "DataImportsPluginHost.c" +#line 3071 "DataImportsPluginHost.c" } SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1) { SpitDataImportsService** result = NULL; SpitDataImportsService** loaded_services = NULL; - SpitDataImportsService** _tmp0_ = NULL; - gint loaded_services_length1 = 0; - gint _loaded_services_size_ = 0; + SpitDataImportsService** _tmp0_; + gint loaded_services_length1; + gint _loaded_services_size_; GeeCollection* pluggables = NULL; - gboolean _tmp1_ = FALSE; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - SpitDataImportsService** _tmp26_ = NULL; - gint _tmp26__length1 = 0; - SpitDataImportsService** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - SpitDataImportsService** _tmp28_ = NULL; - gint _tmp28__length1 = 0; + gboolean _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + gint _tmp4_; + gint _tmp5_; + SpitDataImportsService** _tmp26_; + gint _tmp26__length1; + SpitDataImportsService** _tmp27_; + gint _tmp27__length1; + SpitDataImportsService** _tmp28_; + gint _tmp28__length1; #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = g_new0 (SpitDataImportsService*, 0 + 1); #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3135,11 +3120,11 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_debug ("DataImportsPluginHost.vala:429: DataImportsDialog: discovered %d plugg" \ "able data import services.", _tmp5_); -#line 3130 "DataImportsPluginHost.c" +#line 3115 "DataImportsPluginHost.c" { GeeIterator* _pluggable_it = NULL; - GeeCollection* _tmp6_ = NULL; - GeeIterator* _tmp7_ = NULL; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp6_ = pluggables; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3148,25 +3133,25 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int _pluggable_it = _tmp7_; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" while (TRUE) { -#line 3143 "DataImportsPluginHost.c" - GeeIterator* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 3128 "DataImportsPluginHost.c" + GeeIterator* _tmp8_; + gboolean _tmp9_; SpitPluggable* pluggable = NULL; - GeeIterator* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; + GeeIterator* _tmp10_; + gpointer _tmp11_; gint pluggable_interface = 0; - SpitPluggable* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + SpitPluggable* _tmp12_; + gint _tmp13_; + gint _tmp14_; SpitDataImportsService* service = NULL; - SpitPluggable* _tmp19_ = NULL; - SpitDataImportsService* _tmp20_ = NULL; - SpitDataImportsService* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - SpitDataImportsService** _tmp23_ = NULL; - gint _tmp23__length1 = 0; - SpitDataImportsService* _tmp24_ = NULL; - SpitDataImportsService* _tmp25_ = NULL; + SpitPluggable* _tmp19_; + SpitDataImportsService* _tmp20_; + SpitDataImportsService* _tmp21_; + const gchar* _tmp22_; + SpitDataImportsService** _tmp23_; + gint _tmp23__length1; + SpitDataImportsService* _tmp24_; + SpitDataImportsService* _tmp25_; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp8_ = _pluggable_it; #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3175,7 +3160,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int if (!_tmp9_) { #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" break; -#line 3170 "DataImportsPluginHost.c" +#line 3155 "DataImportsPluginHost.c" } #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp10_ = _pluggable_it; @@ -3193,11 +3178,11 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int _tmp14_ = pluggable_interface; #line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp14_ != SPIT_DATA_IMPORTS_CURRENT_INTERFACE) { -#line 3188 "DataImportsPluginHost.c" - SpitPluggable* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gint _tmp18_ = 0; +#line 3173 "DataImportsPluginHost.c" + SpitPluggable* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gint _tmp18_; #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp15_ = pluggable; #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3215,7 +3200,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int _g_object_unref0 (pluggable); #line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" continue; -#line 3209 "DataImportsPluginHost.c" +#line 3194 "DataImportsPluginHost.c" } #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp19_ = pluggable; @@ -3244,11 +3229,11 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int _g_object_unref0 (service); #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (pluggable); -#line 3237 "DataImportsPluginHost.c" +#line 3222 "DataImportsPluginHost.c" } #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_pluggable_it); -#line 3241 "DataImportsPluginHost.c" +#line 3226 "DataImportsPluginHost.c" } #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp26_ = loaded_services; @@ -3259,7 +3244,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp27__length1 = loaded_services_length1; #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda22____compar_fn_t); + qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda23____compar_fn_t); #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp28_ = loaded_services; #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3268,7 +3253,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int if (result_length1) { #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" *result_length1 = _tmp28__length1; -#line 3261 "DataImportsPluginHost.c" +#line 3246 "DataImportsPluginHost.c" } #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" result = _tmp28_; @@ -3276,15 +3261,15 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int _g_object_unref0 (pluggables); #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3269 "DataImportsPluginHost.c" +#line 3254 "DataImportsPluginHost.c" } void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll) { - ImportManifest* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + ImportManifest* _tmp0_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; #line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); #line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3299,31 +3284,31 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo _tmp3_ = _tmp2_; #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp3_ > 0) { -#line 3292 "DataImportsPluginHost.c" - ImportManifest* _tmp4_ = NULL; +#line 3277 "DataImportsPluginHost.c" + ImportManifest* _tmp4_; #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp4_ = spit_data_imports_meta_manifest; #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" if (_tmp4_ == NULL) { -#line 3298 "DataImportsPluginHost.c" - ImportManifest* _tmp5_ = NULL; +#line 3283 "DataImportsPluginHost.c" + ImportManifest* _tmp5_; #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp5_ = import_manifest_new (NULL, NULL); #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _import_manifest_unref0 (spit_data_imports_meta_manifest); #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_meta_manifest = _tmp5_; -#line 3306 "DataImportsPluginHost.c" +#line 3291 "DataImportsPluginHost.c" } { GeeList* _result_list = NULL; - ImportManifest* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; + ImportManifest* _tmp6_; + GeeList* _tmp7_; + GeeList* _tmp8_; gint _result_size = 0; - GeeList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + GeeList* _tmp9_; + gint _tmp10_; + gint _tmp11_; gint _result_index = 0; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp6_ = manifest; @@ -3345,16 +3330,16 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo _result_index = -1; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" while (TRUE) { -#line 3338 "DataImportsPluginHost.c" - gint _tmp12_ = 0; - gint _tmp13_ = 0; - gint _tmp14_ = 0; +#line 3323 "DataImportsPluginHost.c" + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; BatchImportResult* _result_ = NULL; - GeeList* _tmp15_ = NULL; - gint _tmp16_ = 0; - gpointer _tmp17_ = NULL; - ImportManifest* _tmp18_ = NULL; - BatchImportResult* _tmp19_ = NULL; + GeeList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; + ImportManifest* _tmp18_; + BatchImportResult* _tmp19_; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp12_ = _result_index; #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3367,7 +3352,7 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo if (!(_tmp13_ < _tmp14_)) { #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" break; -#line 3360 "DataImportsPluginHost.c" +#line 3345 "DataImportsPluginHost.c" } #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp15_ = _result_list; @@ -3385,14 +3370,14 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo import_manifest_add_result (_tmp18_, _tmp19_); #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _batch_import_result_unref0 (_result_); -#line 3378 "DataImportsPluginHost.c" +#line 3363 "DataImportsPluginHost.c" } #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (_result_list); -#line 3382 "DataImportsPluginHost.c" +#line 3367 "DataImportsPluginHost.c" } } else { - ImportManifest* _tmp20_ = NULL; + ImportManifest* _tmp20_; #line 470 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" data_imports_ui_data_imports_dialog_terminate_instance (); #line 471 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3403,17 +3388,17 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo _import_manifest_unref0 (spit_data_imports_meta_manifest); #line 472 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_meta_manifest = NULL; -#line 3396 "DataImportsPluginHost.c" +#line 3381 "DataImportsPluginHost.c" } } gint64 spit_data_imports_import_job_comparator (void* a, void* b) { gint64 result = 0LL; - void* _tmp0_ = NULL; - time_t _tmp1_ = 0; - void* _tmp2_ = NULL; - time_t _tmp3_ = 0; + void* _tmp0_; + time_t _tmp1_; + void* _tmp2_; + time_t _tmp3_; #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp0_ = a; #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -3426,7 +3411,7 @@ gint64 spit_data_imports_import_job_comparator (void* a, void* b) { result = (gint64) (_tmp1_ - _tmp3_); #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" return result; -#line 3419 "DataImportsPluginHost.c" +#line 3404 "DataImportsPluginHost.c" } |