diff options
Diffstat (limited to 'src/data_imports')
-rw-r--r-- | src/data_imports/DataImportJob.c | 24 | ||||
-rw-r--r-- | src/data_imports/DataImportSource.c | 2 | ||||
-rw-r--r-- | src/data_imports/DataImports.c | 2 | ||||
-rw-r--r-- | src/data_imports/DataImportsPluginHost.c | 10 | ||||
-rw-r--r-- | src/data_imports/DataImportsUI.c | 2 |
5 files changed, 20 insertions, 20 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" } diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c index 8558571..97e9bbd 100644 --- a/src/data_imports/DataImportSource.c +++ b/src/data_imports/DataImportSource.c @@ -1,4 +1,4 @@ -/* DataImportSource.c generated by valac 0.34.4, the Vala compiler +/* DataImportSource.c generated by valac 0.34.7, the Vala compiler * generated from DataImportSource.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c index 8902b79..b991c53 100644 --- a/src/data_imports/DataImports.c +++ b/src/data_imports/DataImports.c @@ -1,4 +1,4 @@ -/* DataImports.c generated by valac 0.34.4, the Vala compiler +/* DataImports.c generated by valac 0.34.7, the Vala compiler * generated from DataImports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c index 64d9337..3203518 100644 --- a/src/data_imports/DataImportsPluginHost.c +++ b/src/data_imports/DataImportsPluginHost.c @@ -1,4 +1,4 @@ -/* DataImportsPluginHost.c generated by valac 0.34.4, the Vala compiler +/* DataImportsPluginHost.c generated by valac 0.34.7, the Vala compiler * generated from DataImportsPluginHost.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -736,15 +736,15 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" spit_data_imports_plugin_host_update_import_progress_pane (_tmp0_, _tmp1_, _tmp2_); #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp3_ = sorted_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, _spit_data_imports_import_job_comparator_comparator, NULL); + _tmp3_ = sorted_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _spit_data_imports_import_job_comparator_comparator, NULL); #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" jobs = _tmp3_; #line 28 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp4_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 28 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" already_imported = _tmp4_; #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp5_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" failed = _tmp5_; #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -1104,7 +1104,7 @@ void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporte #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" db_name = _tmp8_; #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, batch_import_job_unref, NULL, NULL, NULL); + _tmp9_ = 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_; #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c index 128ad1c..5a1c46a 100644 --- a/src/data_imports/DataImportsUI.c +++ b/src/data_imports/DataImportsUI.c @@ -1,4 +1,4 @@ -/* DataImportsUI.c generated by valac 0.34.4, the Vala compiler +/* DataImportsUI.c generated by valac 0.34.7, the Vala compiler * generated from DataImportsUI.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. |