From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/plugins/Plugins.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/plugins/Plugins.c') diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c index 3817292..f6a6639 100644 --- a/src/plugins/Plugins.c +++ b/src/plugins/Plugins.c @@ -249,7 +249,7 @@ GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self); const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self); const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self); gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* result_length1); -static gchar** _vala_array_dup18 (gchar** self, int length); +static gchar** _vala_array_dup16 (gchar** self, int length); static void plugins_extension_point_finalize (PluginsExtensionPoint * obj); gpointer plugins_module_rep_ref (gpointer instance); void plugins_module_rep_unref (gpointer instance); @@ -299,9 +299,9 @@ gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self); static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj); void plugins_init (GError** error); GFile* app_dirs_get_user_plugins_dir (void); -static void _vala_array_add47 (GFile** * array, int* length, int* size, GFile* value); +static void _vala_array_add50 (GFile** * array, int* length, int* size, GFile* value); GFile* app_dirs_get_system_plugins_dir (void); -static void _vala_array_add48 (GFile** * array, int* length, int* size, GFile* value); +static void _vala_array_add51 (GFile** * array, int* length, int* size, GFile* value); void plugins_search_for_plugins (GFile* dir, GError** error); void plugins_terminate (void); gpointer plugins_notifier_ref (gpointer instance); @@ -322,7 +322,7 @@ static void plugins_notifier_finalize (PluginsNotifier * obj); void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1); GeeCollection* plugins_get_pluggables (gboolean include_disabled); PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle); -static SpitPluggable** _vala_array_dup19 (SpitPluggable** self, int length); +static SpitPluggable** _vala_array_dup17 (SpitPluggable** self, int length); gchar* plugins_get_pluggable_module_id (SpitPluggable* needle); GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled); @@ -507,7 +507,7 @@ gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* } -static gchar** _vala_array_dup18 (gchar** self, int length) { +static gchar** _vala_array_dup16 (gchar** self, int length) { gchar** result; int i; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -540,7 +540,7 @@ static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, g #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0__length1 = value_length1; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup18 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup16 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp1__length1 = _tmp0__length1; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1754,7 +1754,7 @@ void plugins_pluggable_rep_unref (gpointer instance) { } -static void _vala_array_add47 (GFile** * array, int* length, int* size, GFile* value) { +static void _vala_array_add50 (GFile** * array, int* length, int* size, GFile* value) { #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if ((*length) == (*size)) { #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1771,7 +1771,7 @@ static void _vala_array_add47 (GFile** * array, int* length, int* size, GFile* v } -static void _vala_array_add48 (GFile** * array, int* length, int* size, GFile* value) { +static void _vala_array_add51 (GFile** * array, int* length, int* size, GFile* value) { #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if ((*length) == (*size)) { #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1821,7 +1821,7 @@ void plugins_init (GError** error) { #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = app_dirs_get_user_plugins_dir (); #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _vala_array_add47 (&plugins_search_dirs, &plugins_search_dirs_length1, &_plugins_search_dirs_size_, _tmp2_); + _vala_array_add50 (&plugins_search_dirs, &plugins_search_dirs_length1, &_plugins_search_dirs_size_, _tmp2_); #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = plugins_search_dirs; #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1829,7 +1829,7 @@ void plugins_init (GError** error) { #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp4_ = app_dirs_get_system_plugins_dir (); #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _vala_array_add48 (&plugins_search_dirs, &plugins_search_dirs_length1, &_plugins_search_dirs_size_, _tmp4_); + _vala_array_add51 (&plugins_search_dirs, &plugins_search_dirs_length1, &_plugins_search_dirs_size_, _tmp4_); #line 118 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, PLUGINS_TYPE_MODULE_REP, (GBoxedCopyFunc) plugins_module_rep_ref, (GDestroyNotify) plugins_module_rep_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 118 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1899,11 +1899,11 @@ void plugins_init (GError** error) { #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1901 "Plugins.c" - goto __catch35_g_error; + goto __catch39_g_error; } } - goto __finally35; - __catch35_g_error: + goto __finally39; + __catch39_g_error: { GError* err = NULL; GFile* _tmp13_; @@ -1933,7 +1933,7 @@ void plugins_init (GError** error) { _g_error_free0 (err); #line 1934 "Plugins.c" } - __finally35: + __finally39: #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2683,7 +2683,7 @@ gboolean plugins_is_core_pluggable (SpitPluggable* pluggable) { } -static SpitPluggable** _vala_array_dup19 (SpitPluggable** self, int length) { +static SpitPluggable** _vala_array_dup17 (SpitPluggable** self, int length) { SpitPluggable** result; int i; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2775,7 +2775,7 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp13_ = spit_module_get_pluggables (_tmp11_, &_tmp12_); #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp14_ = (_tmp13_ != NULL) ? _vala_array_dup19 (_tmp13_, _tmp12_) : ((gpointer) _tmp13_); + _tmp14_ = (_tmp13_ != NULL) ? _vala_array_dup17 (_tmp13_, _tmp12_) : ((gpointer) _tmp13_); #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp14__length1 = _tmp12_; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3814,11 +3814,11 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3816 "Plugins.c" - goto __catch36_g_error; + goto __catch40_g_error; } } - goto __finally36; - __catch36_g_error: + goto __finally40; + __catch40_g_error: { GError* err = NULL; GFile* _tmp18_; @@ -3848,7 +3848,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _g_error_free0 (err); #line 3849 "Plugins.c" } - __finally36: + __finally40: #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" -- cgit v1.2.3