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/plugins | |
parent | a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff) | |
parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) |
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/DataImportsInterfaces.c | 2 | ||||
-rw-r--r-- | src/plugins/ManifestWidget.c | 6 | ||||
-rw-r--r-- | src/plugins/Plugins.c | 224 | ||||
-rw-r--r-- | src/plugins/PublishingInterfaces.c | 2 | ||||
-rw-r--r-- | src/plugins/SpitInterfaces.c | 2 | ||||
-rw-r--r-- | src/plugins/StandardHostInterface.c | 2 | ||||
-rw-r--r-- | src/plugins/TransitionsInterfaces.c | 34 |
7 files changed, 140 insertions, 132 deletions
diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c index 57e5069..7a23e74 100644 --- a/src/plugins/DataImportsInterfaces.c +++ b/src/plugins/DataImportsInterfaces.c @@ -1,4 +1,4 @@ -/* DataImportsInterfaces.c generated by valac 0.34.4, the Vala compiler +/* DataImportsInterfaces.c generated by valac 0.34.7, the Vala compiler * generated from DataImportsInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c index af0f48d..6ceefd9 100644 --- a/src/plugins/ManifestWidget.c +++ b/src/plugins/ManifestWidget.c @@ -1,4 +1,4 @@ -/* ManifestWidget.c generated by valac 0.34.4, the Vala compiler +/* ManifestWidget.c generated by valac 0.34.7, the Vala compiler * generated from ManifestWidget.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -14,9 +14,9 @@ #include <string.h> #include "shotwell-plugin-dev-1.0.h" #include <gdk-pixbuf/gdk-pixbuf.h> +#include <gdk/gdk.h> #include <gee.h> #include <gio/gio.h> -#include <gdk/gdk.h> #include <gobject/gvaluecollector.h> @@ -2175,7 +2175,7 @@ static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_type_class_add_private (klass, sizeof (PluginsManifestListViewPrivate)); #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - ((GtkWidgetClass *) klass)->button_press_event = plugins_manifest_list_view_real_button_press_event; + ((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) plugins_manifest_list_view_real_button_press_event; #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" G_OBJECT_CLASS (klass)->finalize = plugins_manifest_list_view_finalize; #line 2182 "ManifestWidget.c" diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c index c6ccfad..aeda91e 100644 --- a/src/plugins/Plugins.c +++ b/src/plugins/Plugins.c @@ -1,4 +1,4 @@ -/* Plugins.c generated by valac 0.34.4, the Vala compiler +/* Plugins.c generated by valac 0.34.7, the Vala compiler * generated from Plugins.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1826,25 +1826,25 @@ void plugins_init (GError** error) { #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_); #line 118 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp5_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, PLUGINS_TYPE_MODULE_REP, (GBoxedCopyFunc) plugins_module_rep_ref, plugins_module_rep_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _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" _g_object_unref0 (plugins_module_table); #line 118 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_table = _tmp5_; #line 119 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, PLUGINS_TYPE_PLUGGABLE_REP, (GBoxedCopyFunc) plugins_pluggable_rep_ref, plugins_pluggable_rep_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, PLUGINS_TYPE_PLUGGABLE_REP, (GBoxedCopyFunc) plugins_pluggable_rep_ref, (GDestroyNotify) plugins_pluggable_rep_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 119 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (plugins_pluggable_table); #line 119 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_table = _tmp6_; #line 120 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp7_ = gee_hash_map_new (G_TYPE_GTYPE, NULL, NULL, PLUGINS_TYPE_EXTENSION_POINT, (GBoxedCopyFunc) plugins_extension_point_ref, plugins_extension_point_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp7_ = gee_hash_map_new (G_TYPE_GTYPE, NULL, NULL, PLUGINS_TYPE_EXTENSION_POINT, (GBoxedCopyFunc) plugins_extension_point_ref, (GDestroyNotify) plugins_extension_point_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 120 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (plugins_extension_points); #line 120 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_points = _tmp7_; #line 121 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 121 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (plugins_core_ids); #line 121 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2417,7 +2417,7 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp16_ = plugins_pluggable_table; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp17_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_MAP, GeeMap)); + _tmp17_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp18_ = _tmp17_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2526,7 +2526,7 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) { GeeCollection* all = NULL; GeeHashSet* _tmp0_ = NULL; #line 187 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp0_ = gee_hash_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 187 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" all = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 2532 "Plugins.c" @@ -2541,7 +2541,7 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) { #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp1_ = plugins_pluggable_table; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap)); + _tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = _tmp2_; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2715,7 +2715,7 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_module_table; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = _tmp1_; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2926,15 +2926,19 @@ GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0__target_destroy_notify = compare_func_target_destroy_notify; #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" + compare_func = NULL; +#line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" + compare_func_target = NULL; +#line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" compare_func_target_destroy_notify = NULL; #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp1_ = gee_tree_set_new (PLUGINS_TYPE_EXTENSION_POINT, (GBoxedCopyFunc) plugins_extension_point_ref, plugins_extension_point_unref, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify); + _tmp1_ = gee_tree_set_new (PLUGINS_TYPE_EXTENSION_POINT, (GBoxedCopyFunc) plugins_extension_point_ref, (GDestroyNotify) plugins_extension_point_unref, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify); #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 222 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = plugins_extension_points; #line 222 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap)); + _tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 222 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp4_ = _tmp3_; #line 222 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2955,7 +2959,7 @@ GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void compare_func_target_destroy_notify = NULL; #line 224 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2958 "Plugins.c" +#line 2962 "Plugins.c" } @@ -2984,12 +2988,16 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3__target_destroy_notify = compare_func_target_destroy_notify; #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" + compare_func = NULL; +#line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" + compare_func_target = NULL; +#line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" compare_func_target_destroy_notify = NULL; #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp4_ = gee_tree_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp3_, _tmp3__target, _tmp3__target_destroy_notify); + _tmp4_ = gee_tree_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp3_, _tmp3__target, _tmp3__target_destroy_notify); #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for_type = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection); -#line 2992 "Plugins.c" +#line 3000 "Plugins.c" { GeeIterator* _pluggable_rep_it = NULL; GeeHashMap* _tmp5_ = NULL; @@ -3001,7 +3009,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = plugins_pluggable_table; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - _tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MAP, GeeMap)); + _tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp7_ = _tmp6_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3016,7 +3024,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com _pluggable_rep_it = _tmp10_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 3019 "Plugins.c" +#line 3027 "Plugins.c" GeeIterator* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; PluginsPluggableRep* pluggable_rep = NULL; @@ -3035,7 +3043,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com if (!_tmp12_) { #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3038 "Plugins.c" +#line 3046 "Plugins.c" } #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp13_ = _pluggable_rep_it; @@ -3051,7 +3059,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com _tmp19_ = _tmp18_; #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp19_) { -#line 3054 "Plugins.c" +#line 3062 "Plugins.c" PluginsPluggableRep* _tmp20_ = NULL; SpitPluggable* _tmp21_ = NULL; SpitPluggable* _tmp22_ = NULL; @@ -3072,15 +3080,15 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com _tmp25_ = g_type_is_a (_tmp23_, _tmp24_); #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp16_ = _tmp25_; -#line 3075 "Plugins.c" +#line 3083 "Plugins.c" } else { #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp16_ = FALSE; -#line 3079 "Plugins.c" +#line 3087 "Plugins.c" } #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp16_) { -#line 3083 "Plugins.c" +#line 3091 "Plugins.c" gboolean _tmp26_ = FALSE; gboolean _tmp27_ = FALSE; #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3089,7 +3097,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com if (_tmp27_) { #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp26_ = TRUE; -#line 3092 "Plugins.c" +#line 3100 "Plugins.c" } else { PluginsPluggableRep* _tmp28_ = NULL; gboolean _tmp29_ = FALSE; @@ -3099,19 +3107,19 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com _tmp29_ = plugins_pluggable_rep_is_enabled (_tmp28_); #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp26_ = _tmp29_; -#line 3102 "Plugins.c" +#line 3110 "Plugins.c" } #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp15_ = _tmp26_; -#line 3106 "Plugins.c" +#line 3114 "Plugins.c" } else { #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp15_ = FALSE; -#line 3110 "Plugins.c" +#line 3118 "Plugins.c" } #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp15_) { -#line 3114 "Plugins.c" +#line 3122 "Plugins.c" GeeCollection* _tmp30_ = NULL; PluginsPluggableRep* _tmp31_ = NULL; SpitPluggable* _tmp32_ = NULL; @@ -3126,15 +3134,15 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com _tmp33_ = _tmp32_; #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" gee_collection_add (_tmp30_, _tmp33_); -#line 3129 "Plugins.c" +#line 3137 "Plugins.c" } #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 3133 "Plugins.c" +#line 3141 "Plugins.c" } #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_pluggable_rep_it); -#line 3137 "Plugins.c" +#line 3145 "Plugins.c" } #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = for_type; @@ -3148,7 +3156,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com compare_func_target_destroy_notify = NULL; #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3151 "Plugins.c" +#line 3159 "Plugins.c" } @@ -3176,7 +3184,7 @@ gchar* plugins_get_pluggable_name (const gchar* id) { _tmp5_ = pluggable_rep; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp5_ != NULL) { -#line 3179 "Plugins.c" +#line 3187 "Plugins.c" PluginsPluggableRep* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; @@ -3188,15 +3196,15 @@ gchar* plugins_get_pluggable_name (const gchar* id) { _tmp8_ = _tmp7_; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp4_ = _tmp8_; -#line 3191 "Plugins.c" +#line 3199 "Plugins.c" } else { #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp4_ = FALSE; -#line 3195 "Plugins.c" +#line 3203 "Plugins.c" } #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp4_) { -#line 3199 "Plugins.c" +#line 3207 "Plugins.c" PluginsPluggableRep* _tmp9_ = NULL; SpitPluggable* _tmp10_ = NULL; SpitPluggable* _tmp11_ = NULL; @@ -3211,11 +3219,11 @@ gchar* plugins_get_pluggable_name (const gchar* id) { _tmp12_ = spit_pluggable_get_pluggable_name (_tmp11_); #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = _tmp12_; -#line 3214 "Plugins.c" +#line 3222 "Plugins.c" } else { #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = NULL; -#line 3218 "Plugins.c" +#line 3226 "Plugins.c" } #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp13_ = g_strdup (_tmp3_); @@ -3225,7 +3233,7 @@ gchar* plugins_get_pluggable_name (const gchar* id) { _plugins_pluggable_rep_unref0 (pluggable_rep); #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3228 "Plugins.c" +#line 3236 "Plugins.c" } @@ -3258,7 +3266,7 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) { if (_tmp4_ == NULL) { #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = TRUE; -#line 3261 "Plugins.c" +#line 3269 "Plugins.c" } else { PluginsPluggableRep* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; @@ -3271,7 +3279,7 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) { _tmp7_ = _tmp6_; #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = !_tmp7_; -#line 3274 "Plugins.c" +#line 3282 "Plugins.c" } #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp3_) { @@ -3281,7 +3289,7 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) { _plugins_pluggable_rep_unref0 (pluggable_rep); #line 254 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3284 "Plugins.c" +#line 3292 "Plugins.c" } #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = pluggable_rep; @@ -3297,7 +3305,7 @@ gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) { _plugins_pluggable_rep_unref0 (pluggable_rep); #line 258 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3300 "Plugins.c" +#line 3308 "Plugins.c" } @@ -3328,7 +3336,7 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) { if (_tmp4_ == NULL) { #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = TRUE; -#line 3331 "Plugins.c" +#line 3339 "Plugins.c" } else { PluginsPluggableRep* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; @@ -3341,7 +3349,7 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) { _tmp7_ = _tmp6_; #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = !_tmp7_; -#line 3344 "Plugins.c" +#line 3352 "Plugins.c" } #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp3_) { @@ -3355,11 +3363,11 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) { if (enabled) { #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *enabled = _vala_enabled; -#line 3358 "Plugins.c" +#line 3366 "Plugins.c" } #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3362 "Plugins.c" +#line 3370 "Plugins.c" } #line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = pluggable_rep; @@ -3375,11 +3383,11 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) { if (enabled) { #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *enabled = _vala_enabled; -#line 3378 "Plugins.c" +#line 3386 "Plugins.c" } #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3382 "Plugins.c" +#line 3390 "Plugins.c" } @@ -3409,7 +3417,7 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) { if (_tmp4_ == NULL) { #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = TRUE; -#line 3412 "Plugins.c" +#line 3420 "Plugins.c" } else { PluginsPluggableRep* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; @@ -3422,7 +3430,7 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) { _tmp7_ = _tmp6_; #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = !_tmp7_; -#line 3425 "Plugins.c" +#line 3433 "Plugins.c" } #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp3_) { @@ -3430,7 +3438,7 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) { _plugins_pluggable_rep_unref0 (pluggable_rep); #line 277 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 3433 "Plugins.c" +#line 3441 "Plugins.c" } #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = pluggable_rep; @@ -3440,7 +3448,7 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) { _tmp10_ = plugins_pluggable_rep_set_enabled (_tmp8_, _tmp9_); #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp10_) { -#line 3443 "Plugins.c" +#line 3451 "Plugins.c" PluginsNotifier* _tmp11_ = NULL; PluginsNotifier* _tmp12_ = NULL; PluginsPluggableRep* _tmp13_ = NULL; @@ -3463,11 +3471,11 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) { g_signal_emit_by_name (_tmp12_, "pluggable-activation", _tmp15_, _tmp16_); #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_notifier_unref0 (_tmp12_); -#line 3466 "Plugins.c" +#line 3474 "Plugins.c" } #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 3470 "Plugins.c" +#line 3478 "Plugins.c" } @@ -3491,7 +3499,7 @@ GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) { _tmp3_ = module_rep; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp3_ != NULL) { -#line 3494 "Plugins.c" +#line 3502 "Plugins.c" PluginsModuleRep* _tmp4_ = NULL; GFile* _tmp5_ = NULL; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3500,11 +3508,11 @@ GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) { _tmp5_ = _tmp4_->file; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = _tmp5_; -#line 3503 "Plugins.c" +#line 3511 "Plugins.c" } else { #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = NULL; -#line 3507 "Plugins.c" +#line 3515 "Plugins.c" } #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp6_ = _g_object_ref0 (_tmp2_); @@ -3514,7 +3522,7 @@ GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) { _plugins_module_rep_unref0 (module_rep); #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3517 "Plugins.c" +#line 3525 "Plugins.c" } @@ -3545,7 +3553,7 @@ gint plugins_compare_pluggable_names (void* a, void* b) { result = _tmp4_; #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3548 "Plugins.c" +#line 3556 "Plugins.c" } @@ -3582,7 +3590,7 @@ gint plugins_compare_extension_point_names (void* a, void* b) { result = _tmp6_; #line 300 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3585 "Plugins.c" +#line 3593 "Plugins.c" } @@ -3615,7 +3623,7 @@ gboolean plugins_is_shared_library (GFile* file) { ext = _tmp4_; #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (_tmp2_); -#line 3618 "Plugins.c" +#line 3626 "Plugins.c" { const gchar** shared_ext_collection = NULL; gint shared_ext_collection_length1 = 0; @@ -3627,14 +3635,14 @@ gboolean plugins_is_shared_library (GFile* file) { shared_ext_collection_length1 = G_N_ELEMENTS (PLUGINS_SHARED_LIB_EXTS); #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (shared_ext_it = 0; shared_ext_it < G_N_ELEMENTS (PLUGINS_SHARED_LIB_EXTS); shared_ext_it = shared_ext_it + 1) { -#line 3630 "Plugins.c" +#line 3638 "Plugins.c" gchar* _tmp5_ = NULL; gchar* shared_ext = NULL; #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = g_strdup (shared_ext_collection[shared_ext_it]); #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" shared_ext = _tmp5_; -#line 3637 "Plugins.c" +#line 3645 "Plugins.c" { const gchar* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; @@ -3654,11 +3662,11 @@ gboolean plugins_is_shared_library (GFile* file) { _g_free0 (name); #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3657 "Plugins.c" +#line 3665 "Plugins.c" } #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (shared_ext); -#line 3661 "Plugins.c" +#line 3669 "Plugins.c" } } } @@ -3670,7 +3678,7 @@ gboolean plugins_is_shared_library (GFile* file) { _g_free0 (name); #line 312 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3673 "Plugins.c" +#line 3681 "Plugins.c" } @@ -3706,7 +3714,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { g_propagate_error (error, _inner_error_); #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 3709 "Plugins.c" +#line 3717 "Plugins.c" } { gboolean _tmp5_ = FALSE; @@ -3714,7 +3722,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _tmp5_ = TRUE; #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 3717 "Plugins.c" +#line 3725 "Plugins.c" GFileInfo* info = NULL; GFileEnumerator* _tmp6_ = NULL; GFileInfo* _tmp7_ = NULL; @@ -3730,7 +3738,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { GFileType _tmp16_ = 0; #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!_tmp5_) { -#line 3733 "Plugins.c" +#line 3741 "Plugins.c" } #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = FALSE; @@ -3748,7 +3756,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _g_object_unref0 (enumerator); #line 323 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 3751 "Plugins.c" +#line 3759 "Plugins.c" } #line 324 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = info; @@ -3758,7 +3766,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _g_object_unref0 (info); #line 325 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3761 "Plugins.c" +#line 3769 "Plugins.c" } #line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp9_ = info; @@ -3770,7 +3778,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _g_object_unref0 (info); #line 328 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" continue; -#line 3773 "Plugins.c" +#line 3781 "Plugins.c" } #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = dir; @@ -3790,7 +3798,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { switch (_tmp16_) { #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" case G_FILE_TYPE_DIRECTORY: -#line 3793 "Plugins.c" +#line 3801 "Plugins.c" { { GFile* _tmp17_ = NULL; @@ -3800,7 +3808,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { plugins_search_for_plugins (_tmp17_, &_inner_error_); #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3803 "Plugins.c" +#line 3811 "Plugins.c" goto __catch36_g_error; } } @@ -3833,7 +3841,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _g_free0 (_tmp20_); #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_error_free0 (err); -#line 3836 "Plugins.c" +#line 3844 "Plugins.c" } __finally36: #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3848,15 +3856,15 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _g_object_unref0 (enumerator); #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 3851 "Plugins.c" +#line 3859 "Plugins.c" } #line 339 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3855 "Plugins.c" +#line 3863 "Plugins.c" } #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" case G_FILE_TYPE_REGULAR: -#line 3859 "Plugins.c" +#line 3867 "Plugins.c" { GFile* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; @@ -3866,35 +3874,35 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _tmp24_ = plugins_is_shared_library (_tmp23_); #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp24_) { -#line 3869 "Plugins.c" +#line 3877 "Plugins.c" GFile* _tmp25_ = NULL; #line 343 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp25_ = file; #line 343 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_load_module (_tmp25_); -#line 3875 "Plugins.c" +#line 3883 "Plugins.c" } #line 344 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3879 "Plugins.c" +#line 3887 "Plugins.c" } default: { #line 348 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3885 "Plugins.c" +#line 3893 "Plugins.c" } } #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (file); #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (info); -#line 3892 "Plugins.c" +#line 3900 "Plugins.c" } } #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (enumerator); -#line 3897 "Plugins.c" +#line 3905 "Plugins.c" } @@ -3971,7 +3979,7 @@ void plugins_load_module (GFile* file) { _tmp2_ = module_rep; #line 355 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp2_ == NULL) { -#line 3974 "Plugins.c" +#line 3982 "Plugins.c" GFile* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -3992,7 +4000,7 @@ void plugins_load_module (GFile* file) { _plugins_module_rep_unref0 (module_rep); #line 358 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 3995 "Plugins.c" +#line 4003 "Plugins.c" } #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp7_ = module_rep; @@ -4004,7 +4012,7 @@ void plugins_load_module (GFile* file) { entry = _tmp9_; #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!_tmp10_) { -#line 4007 "Plugins.c" +#line 4015 "Plugins.c" GFile* _tmp11_ = NULL; gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; @@ -4023,7 +4031,7 @@ void plugins_load_module (GFile* file) { _plugins_module_rep_unref0 (module_rep); #line 367 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4025 "Plugins.c" +#line 4033 "Plugins.c" } #line 370 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp14_ = entry; @@ -4033,11 +4041,11 @@ void plugins_load_module (GFile* file) { if (PLUGINS_MIN_SPIT_INTERFACE <= SPIT_CURRENT_INTERFACE) { #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp15_ = SPIT_CURRENT_INTERFACE <= PLUGINS_MAX_SPIT_INTERFACE; -#line 4035 "Plugins.c" +#line 4043 "Plugins.c" } else { #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp15_ = FALSE; -#line 4039 "Plugins.c" +#line 4047 "Plugins.c" } #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _vala_assert (_tmp15_, "MIN_SPIT_INTERFACE <= Spit.CURRENT_INTERFACE && Spit.CURRENT_INTERFACE <= MAX_SPIT_INTERFACE"); @@ -4073,7 +4081,7 @@ void plugins_load_module (GFile* file) { _tmp22_ = _tmp21_.module_spit_interface; #line 380 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp22_ == SPIT_UNSUPPORTED_INTERFACE) { -#line 4075 "Plugins.c" +#line 4083 "Plugins.c" GFile* _tmp23_ = NULL; gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; @@ -4094,7 +4102,7 @@ void plugins_load_module (GFile* file) { _plugins_module_rep_unref0 (module_rep); #line 384 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4095 "Plugins.c" +#line 4103 "Plugins.c" } #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp27_ = params; @@ -4104,7 +4112,7 @@ void plugins_load_module (GFile* file) { if (_tmp28_ < PLUGINS_MIN_SPIT_INTERFACE) { #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp26_ = TRUE; -#line 4105 "Plugins.c" +#line 4113 "Plugins.c" } else { SpitEntryPointParams _tmp29_ = {0}; gint _tmp30_ = 0; @@ -4114,11 +4122,11 @@ void plugins_load_module (GFile* file) { _tmp30_ = _tmp29_.module_spit_interface; #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp26_ = _tmp30_ > PLUGINS_MAX_SPIT_INTERFACE; -#line 4115 "Plugins.c" +#line 4123 "Plugins.c" } #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp26_) { -#line 4119 "Plugins.c" +#line 4127 "Plugins.c" GFile* _tmp31_ = NULL; gchar* _tmp32_ = NULL; gchar* _tmp33_ = NULL; @@ -4145,7 +4153,7 @@ void plugins_load_module (GFile* file) { _plugins_module_rep_unref0 (module_rep); #line 391 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4145 "Plugins.c" +#line 4153 "Plugins.c" } #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp36_ = module_rep; @@ -4161,7 +4169,7 @@ void plugins_load_module (GFile* file) { _tmp40_ = _tmp39_->spit_module; #line 397 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SPIT_TYPE_MODULE)) { -#line 4161 "Plugins.c" +#line 4169 "Plugins.c" PluginsModuleRep* _tmp41_ = NULL; #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp41_ = module_rep; @@ -4169,7 +4177,7 @@ void plugins_load_module (GFile* file) { _g_object_unref0 (_tmp41_->spit_module); #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp41_->spit_module = NULL; -#line 4169 "Plugins.c" +#line 4177 "Plugins.c" } #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp42_ = module_rep; @@ -4177,7 +4185,7 @@ void plugins_load_module (GFile* file) { _tmp43_ = _tmp42_->spit_module; #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp43_ == NULL) { -#line 4177 "Plugins.c" +#line 4185 "Plugins.c" GFile* _tmp44_ = NULL; gchar* _tmp45_ = NULL; gchar* _tmp46_ = NULL; @@ -4204,7 +4212,7 @@ void plugins_load_module (GFile* file) { _plugins_module_rep_unref0 (module_rep); #line 404 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4203 "Plugins.c" +#line 4211 "Plugins.c" } #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp49_ = module_rep; @@ -4226,7 +4234,7 @@ void plugins_load_module (GFile* file) { _tmp55_ = _tmp54_->id; #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp55_ == NULL) { -#line 4225 "Plugins.c" +#line 4233 "Plugins.c" GFile* _tmp56_ = NULL; gchar* _tmp57_ = NULL; gchar* _tmp58_ = NULL; @@ -4253,7 +4261,7 @@ void plugins_load_module (GFile* file) { _plugins_module_rep_unref0 (module_rep); #line 414 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4251 "Plugins.c" +#line 4259 "Plugins.c" } #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp61_ = plugins_module_table; @@ -4265,7 +4273,7 @@ void plugins_load_module (GFile* file) { _tmp64_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp63_); #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp64_) { -#line 4263 "Plugins.c" +#line 4271 "Plugins.c" GFile* _tmp65_ = NULL; gchar* _tmp66_ = NULL; gchar* _tmp67_ = NULL; @@ -4298,7 +4306,7 @@ void plugins_load_module (GFile* file) { _plugins_module_rep_unref0 (module_rep); #line 421 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 4295 "Plugins.c" +#line 4303 "Plugins.c" } #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp72_ = module_rep; @@ -4342,7 +4350,7 @@ void plugins_load_module (GFile* file) { _tmp88_ = _tmp87_->spit_module; #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp90_ = spit_module_get_pluggables (_tmp88_, &_tmp89_); -#line 4339 "Plugins.c" +#line 4347 "Plugins.c" { SpitPluggable** pluggable_collection = NULL; gint pluggable_collection_length1 = 0; @@ -4354,14 +4362,14 @@ void plugins_load_module (GFile* file) { pluggable_collection_length1 = _tmp89_; #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (pluggable_it = 0; pluggable_it < _tmp89_; pluggable_it = pluggable_it + 1) { -#line 4351 "Plugins.c" +#line 4359 "Plugins.c" SpitPluggable* _tmp91_ = NULL; SpitPluggable* pluggable = NULL; #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp91_ = _g_object_ref0 (pluggable_collection[pluggable_it]); #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" pluggable = _tmp91_; -#line 4358 "Plugins.c" +#line 4366 "Plugins.c" { GeeHashMap* _tmp92_ = NULL; SpitPluggable* _tmp93_ = NULL; @@ -4387,7 +4395,7 @@ void plugins_load_module (GFile* file) { _plugins_pluggable_rep_unref0 (_tmp97_); #line 431 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (pluggable); -#line 4384 "Plugins.c" +#line 4392 "Plugins.c" } } } @@ -4395,7 +4403,7 @@ void plugins_load_module (GFile* file) { spit_entry_point_params_destroy (¶ms); #line 353 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); -#line 4392 "Plugins.c" +#line 4400 "Plugins.c" } diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c index 4dfb6a4..bb5d614 100644 --- a/src/plugins/PublishingInterfaces.c +++ b/src/plugins/PublishingInterfaces.c @@ -1,4 +1,4 @@ -/* PublishingInterfaces.c generated by valac 0.34.4, the Vala compiler +/* PublishingInterfaces.c generated by valac 0.34.7, the Vala compiler * generated from PublishingInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/SpitInterfaces.c b/src/plugins/SpitInterfaces.c index dc6fb3b..7c1d3cc 100644 --- a/src/plugins/SpitInterfaces.c +++ b/src/plugins/SpitInterfaces.c @@ -1,4 +1,4 @@ -/* SpitInterfaces.c generated by valac 0.34.4, the Vala compiler +/* SpitInterfaces.c generated by valac 0.34.7, the Vala compiler * generated from SpitInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/StandardHostInterface.c b/src/plugins/StandardHostInterface.c index 497024d..1694df3 100644 --- a/src/plugins/StandardHostInterface.c +++ b/src/plugins/StandardHostInterface.c @@ -1,4 +1,4 @@ -/* StandardHostInterface.c generated by valac 0.34.4, the Vala compiler +/* StandardHostInterface.c generated by valac 0.34.7, the Vala compiler * generated from StandardHostInterface.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c index 128f648..110b59a 100644 --- a/src/plugins/TransitionsInterfaces.c +++ b/src/plugins/TransitionsInterfaces.c @@ -1,4 +1,4 @@ -/* TransitionsInterfaces.c generated by valac 0.34.4, the Vala compiler +/* TransitionsInterfaces.c generated by valac 0.34.7, the Vala compiler * generated from TransitionsInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -698,21 +698,21 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_type_class_add_private (klass, sizeof (SpitTransitionsVisualsPrivate)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved0 = spit_transitions_visuals_real_reserved0; + ((SpitTransitionsVisualsClass *) klass)->reserved0 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved0; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved1 = spit_transitions_visuals_real_reserved1; + ((SpitTransitionsVisualsClass *) klass)->reserved1 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved1; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved2 = spit_transitions_visuals_real_reserved2; + ((SpitTransitionsVisualsClass *) klass)->reserved2 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved2; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved3 = spit_transitions_visuals_real_reserved3; + ((SpitTransitionsVisualsClass *) klass)->reserved3 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved3; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved4 = spit_transitions_visuals_real_reserved4; + ((SpitTransitionsVisualsClass *) klass)->reserved4 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved4; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved5 = spit_transitions_visuals_real_reserved5; + ((SpitTransitionsVisualsClass *) klass)->reserved5 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved5; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved6 = spit_transitions_visuals_real_reserved6; + ((SpitTransitionsVisualsClass *) klass)->reserved6 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved6; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved7 = spit_transitions_visuals_real_reserved7; + ((SpitTransitionsVisualsClass *) klass)->reserved7 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved7; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->get_property = _vala_spit_transitions_visuals_get_property; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1208,21 +1208,21 @@ static void spit_transitions_motion_class_init (SpitTransitionsMotionClass * kla #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_type_class_add_private (klass, sizeof (SpitTransitionsMotionPrivate)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved0 = spit_transitions_motion_real_reserved0; + ((SpitTransitionsMotionClass *) klass)->reserved0 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved0; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved1 = spit_transitions_motion_real_reserved1; + ((SpitTransitionsMotionClass *) klass)->reserved1 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved1; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved2 = spit_transitions_motion_real_reserved2; + ((SpitTransitionsMotionClass *) klass)->reserved2 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved2; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved3 = spit_transitions_motion_real_reserved3; + ((SpitTransitionsMotionClass *) klass)->reserved3 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved3; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved4 = spit_transitions_motion_real_reserved4; + ((SpitTransitionsMotionClass *) klass)->reserved4 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved4; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved5 = spit_transitions_motion_real_reserved5; + ((SpitTransitionsMotionClass *) klass)->reserved5 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved5; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved6 = spit_transitions_motion_real_reserved6; + ((SpitTransitionsMotionClass *) klass)->reserved6 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved6; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved7 = spit_transitions_motion_real_reserved7; + ((SpitTransitionsMotionClass *) klass)->reserved7 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved7; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->get_property = _vala_spit_transitions_motion_get_property; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" |