diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
| commit | abdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch) | |
| tree | 26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/data_imports/DataImports.c | |
| parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
| parent | dd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/data_imports/DataImports.c')
| -rw-r--r-- | src/data_imports/DataImports.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c index b991c53..34a114f 100644 --- a/src/data_imports/DataImports.c +++ b/src/data_imports/DataImports.c @@ -1,4 +1,4 @@ -/* DataImports.c generated by valac 0.34.7, the Vala compiler +/* DataImports.c generated by valac 0.36.6, the Vala compiler * generated from DataImports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -26,7 +26,7 @@ void data_imports_init (GError** error); -static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value); void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1); #define RESOURCES_IMPORT "import" void data_imports_terminate (void); @@ -34,7 +34,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value) { #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" if ((*length) == (*size)) { #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" @@ -53,15 +53,14 @@ static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* va void data_imports_init (GError** error) { gchar** core_ids = NULL; - gchar** _tmp0_ = NULL; - gint core_ids_length1 = 0; - gint _core_ids_size_ = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; + gchar** _tmp0_; + gint core_ids_length1; + gint _core_ids_size_; + gchar** _tmp1_; + gint _tmp1__length1; + gchar* _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; #line 19 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" _tmp0_ = g_new0 (gchar*, 0 + 1); #line 19 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" @@ -79,16 +78,14 @@ void data_imports_init (GError** error) { #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" _vala_array_add68 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_); #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" - _tmp3_ = _ ("Data Imports"); + _tmp3_ = core_ids; #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" - _tmp4_ = core_ids; + _tmp3__length1 = core_ids_length1; #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" - _tmp4__length1 = core_ids_length1; -#line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" - plugins_register_extension_point (SPIT_DATA_IMPORTS_TYPE_SERVICE, _tmp3_, RESOURCES_IMPORT, _tmp4_, _tmp4__length1); + plugins_register_extension_point (SPIT_DATA_IMPORTS_TYPE_SERVICE, _ ("Data Imports"), RESOURCES_IMPORT, _tmp3_, _tmp3__length1); #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala" core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL); -#line 92 "DataImports.c" +#line 89 "DataImports.c" } |