diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-08-05 08:00:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-08-05 08:00:12 +0200 |
| commit | 8ae550d463720d5d1c0e253af29843ff15de1a54 (patch) | |
| tree | b6be28a7d546e7a174910ee83d6af555ed8860fa /src/data_imports | |
| parent | 709e2d6f5652ec90c194a4ec2b530bebc6f952cb (diff) | |
| parent | 9df0619e4e581eac73e5f3b76d271f1fff192f81 (diff) | |
Merge branch 'release/debian/0.28.4-1'debian/0.28.4-1
Diffstat (limited to 'src/data_imports')
| -rw-r--r-- | src/data_imports/DataImports.c | 6 | ||||
| -rw-r--r-- | src/data_imports/DataImportsPluginHost.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c index e7ae485..a1ebfb1 100644 --- a/src/data_imports/DataImports.c +++ b/src/data_imports/DataImports.c @@ -27,7 +27,7 @@ void data_imports_init (GError** error); -static void _vala_array_add71 (gchar** * array, +static void _vala_array_add70 (gchar** * array, int* length, int* size, gchar* value); @@ -47,7 +47,7 @@ static void _vala_array_free (gpointer array, static void -_vala_array_add71 (gchar** * array, +_vala_array_add70 (gchar** * array, int* length, int* size, gchar* value) @@ -95,7 +95,7 @@ data_imports_init (GError** error) #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" _tmp2_ = g_strdup ("org.yorba.shotwell.dataimports.fspot"); #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" - _vala_array_add71 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_); + _vala_array_add70 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_); #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" _tmp3_ = core_ids; #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c index 6b42fc1..8b74806 100644 --- a/src/data_imports/DataImportsPluginHost.c +++ b/src/data_imports/DataImportsPluginHost.c @@ -785,7 +785,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); gchar* plugins_get_pluggable_module_id (SpitPluggable* needle); -static void _vala_array_add72 (SpitDataImportsService** * array, +static void _vala_array_add71 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value); @@ -3259,7 +3259,7 @@ spit_data_imports_load_all_services (int* result_length1) static void -_vala_array_add72 (SpitDataImportsService** * array, +_vala_array_add71 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value) @@ -3450,7 +3450,7 @@ spit_data_imports_load_services (gboolean load_all, #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp22_ = _g_object_ref0 (_tmp21_); #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _vala_array_add72 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp22_); + _vala_array_add71 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp22_); #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _g_object_unref0 (service); #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" |