diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
| commit | dfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch) | |
| tree | dee893916166ac1c8b479b74e7f341429945260e /src/data_imports/DataImportJob.c | |
| parent | a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff) | |
| parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) | |
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/data_imports/DataImportJob.c')
| -rw-r--r-- | src/data_imports/DataImportJob.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c index 68aba6f..8f75c81 100644 --- a/src/data_imports/DataImportJob.c +++ b/src/data_imports/DataImportJob.c @@ -1,4 +1,4 @@ -/* DataImportJob.c generated by valac 0.34.4, the Vala compiler +/* DataImportJob.c generated by valac 0.34.7, the Vala compiler * generated from DataImportJob.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -518,7 +518,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i #line 29 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL); #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" detected_htags = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" @@ -1557,7 +1557,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_TAG (tag), NULL); #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - _tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" components = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList); #line 1564 "DataImportJob.c" @@ -1668,23 +1668,23 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" g_type_class_add_private (klass, sizeof (SpitDataImportsDataImportJobPrivate)); #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - ((BatchImportJobClass *) klass)->get_dest_identifier = spit_data_imports_data_import_job_real_get_dest_identifier; + ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_dest_identifier; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - ((BatchImportJobClass *) klass)->get_source_identifier = spit_data_imports_data_import_job_real_get_source_identifier; + ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_source_identifier; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - ((BatchImportJobClass *) klass)->is_directory = spit_data_imports_data_import_job_real_is_directory; + ((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_is_directory; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - ((BatchImportJobClass *) klass)->get_basename = spit_data_imports_data_import_job_real_get_basename; + ((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_basename; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - ((BatchImportJobClass *) klass)->get_path = spit_data_imports_data_import_job_real_get_path; + ((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_path; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - ((BatchImportJobClass *) klass)->set_associated = spit_data_imports_data_import_job_real_set_associated; + ((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) spit_data_imports_data_import_job_real_set_associated; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - ((BatchImportJobClass *) klass)->determine_file_size = spit_data_imports_data_import_job_real_determine_file_size; + ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) spit_data_imports_data_import_job_real_determine_file_size; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - ((BatchImportJobClass *) klass)->prepare = spit_data_imports_data_import_job_real_prepare; + ((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare; #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala" - ((BatchImportJobClass *) klass)->complete = spit_data_imports_data_import_job_real_complete; + ((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete; #line 1689 "DataImportJob.c" } |