diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/DataImportsInterfaces.c | 2 | ||||
| -rw-r--r-- | src/plugins/ManifestWidget.c | 586 | ||||
| -rw-r--r-- | src/plugins/Plugins.c | 1583 | ||||
| -rw-r--r-- | src/plugins/PublishingInterfaces.c | 182 | ||||
| -rw-r--r-- | src/plugins/SpitInterfaces.c | 66 | ||||
| -rw-r--r-- | src/plugins/StandardHostInterface.c | 186 | ||||
| -rw-r--r-- | src/plugins/TransitionsInterfaces.c | 587 |
7 files changed, 1669 insertions, 1523 deletions
diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c index 7a23e74..49b2b48 100644 --- a/src/plugins/DataImportsInterfaces.c +++ b/src/plugins/DataImportsInterfaces.c @@ -1,4 +1,4 @@ -/* DataImportsInterfaces.c generated by valac 0.34.7, the Vala compiler +/* DataImportsInterfaces.c generated by valac 0.36.6, 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 6ceefd9..b309c95 100644 --- a/src/plugins/ManifestWidget.c +++ b/src/plugins/ManifestWidget.c @@ -1,4 +1,4 @@ -/* ManifestWidget.c generated by valac 0.34.7, the Vala compiler +/* ManifestWidget.c generated by valac 0.36.6, the Vala compiler * generated from ManifestWidget.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -135,13 +135,13 @@ static void plugins_manifest_widget_mediator_set_about_button_sensitivity (Plugi gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, int* result_length1); gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info); gboolean is_string_empty (const gchar* s); -static void _vala_array_add49 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value); GdkPixbuf* resources_get_icon (const gchar* name, gint scale); #define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png" #define RESOURCES_DEFAULT_ICON_SCALE 24 gchar* plugins_get_pluggable_name (const gchar* id); GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMediator* self); -static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator* obj); +static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator * obj); #define PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListViewPrivate)) enum { PLUGINS_MANIFEST_LIST_VIEW_DUMMY_PROPERTY @@ -169,12 +169,12 @@ gint plugins_compare_pluggable_names (void* a, void* b); static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled); static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, GtkTreePath* path, GtkTreeIter* iter); -static void _vala_array_add50 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add50 (gchar** * array, int* length, int* size, gchar* value); static void _gtk_tree_path_free0_ (gpointer var); static void _g_list_free__gtk_tree_path_free0_ (GList* self); static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* base, GdkEventButton* event); void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled); -static void plugins_manifest_list_view_finalize (GObject* obj); +static void plugins_manifest_list_view_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -196,13 +196,13 @@ static void _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_sele PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type) { PluginsManifestWidgetMediator* self = NULL; - GtkScrolledWindow* _tmp0_ = NULL; - GtkScrolledWindow* _tmp1_ = NULL; - PluginsManifestListView* _tmp2_ = NULL; - GtkButton* _tmp3_ = NULL; - GtkButton* _tmp4_ = NULL; - PluginsManifestListView* _tmp5_ = NULL; - GtkTreeSelection* _tmp6_ = NULL; + GtkScrolledWindow* _tmp0_; + GtkScrolledWindow* _tmp1_; + PluginsManifestListView* _tmp2_; + GtkButton* _tmp3_; + GtkButton* _tmp4_; + PluginsManifestListView* _tmp5_; + GtkTreeSelection* _tmp6_; #line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self = (PluginsManifestWidgetMediator*) g_type_create_instance (object_type); #line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -243,27 +243,27 @@ PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void) { static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 263 "ManifestWidget.c" } -static void _vala_array_add49 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value) { #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if ((*length) == (*size)) { #line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -289,67 +289,67 @@ static gpointer _g_object_ref0 (gpointer self) { static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMediator* self) { gchar** ids = NULL; - PluginsManifestListView* _tmp0_ = NULL; - gint _tmp1_ = 0; - gchar** _tmp2_ = NULL; - gint ids_length1 = 0; - gint _ids_size_ = 0; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; + PluginsManifestListView* _tmp0_; + gint _tmp1_; + gchar** _tmp2_; + gint ids_length1; + gint _ids_size_; + gchar** _tmp3_; + gint _tmp3__length1; gchar* id = NULL; - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gchar** _tmp4_; + gint _tmp4__length1; + const gchar* _tmp5_; + gchar* _tmp6_; SpitPluggableInfo info = {0}; - const gchar* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + const gchar* _tmp7_; + gboolean _tmp8_; gchar** authors = NULL; - gint authors_length1 = 0; - gint _authors_size_ = 0; - SpitPluggableInfo _tmp10_ = {0}; - const gchar* _tmp11_ = NULL; + gint authors_length1; + gint _authors_size_; + SpitPluggableInfo _tmp10_; + const gchar* _tmp11_; GtkAboutDialog* about_dialog = NULL; - GtkAboutDialog* _tmp31_ = NULL; - GtkAboutDialog* _tmp32_ = NULL; - gchar** _tmp33_ = NULL; - gint _tmp33__length1 = 0; - GtkAboutDialog* _tmp34_ = NULL; - SpitPluggableInfo _tmp35_ = {0}; - const gchar* _tmp36_ = NULL; - GtkAboutDialog* _tmp37_ = NULL; - SpitPluggableInfo _tmp38_ = {0}; - const gchar* _tmp39_ = NULL; - GtkAboutDialog* _tmp40_ = NULL; - SpitPluggableInfo _tmp41_ = {0}; - const gchar* _tmp42_ = NULL; - GtkAboutDialog* _tmp43_ = NULL; - SpitPluggableInfo _tmp44_ = {0}; - gboolean _tmp45_ = FALSE; + GtkAboutDialog* _tmp31_; + GtkAboutDialog* _tmp32_; + gchar** _tmp33_; + gint _tmp33__length1; + GtkAboutDialog* _tmp34_; + SpitPluggableInfo _tmp35_; + const gchar* _tmp36_; + GtkAboutDialog* _tmp37_; + SpitPluggableInfo _tmp38_; + const gchar* _tmp39_; + GtkAboutDialog* _tmp40_; + SpitPluggableInfo _tmp41_; + const gchar* _tmp42_; + GtkAboutDialog* _tmp43_; + SpitPluggableInfo _tmp44_; + gboolean _tmp45_; GdkPixbuf* _tmp46_ = NULL; gboolean _tmp47_ = FALSE; - SpitPluggableInfo _tmp48_ = {0}; - GdkPixbuf** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - GtkAboutDialog* _tmp57_ = NULL; - GtkAboutDialog* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - GtkAboutDialog* _tmp62_ = NULL; - SpitPluggableInfo _tmp63_ = {0}; - const gchar* _tmp64_ = NULL; - GtkAboutDialog* _tmp65_ = NULL; - SpitPluggableInfo _tmp66_ = {0}; - const gchar* _tmp67_ = NULL; - GtkAboutDialog* _tmp68_ = NULL; - SpitPluggableInfo _tmp69_ = {0}; - const gchar* _tmp70_ = NULL; - GtkAboutDialog* _tmp71_ = NULL; - SpitPluggableInfo _tmp72_ = {0}; - const gchar* _tmp73_ = NULL; - GtkAboutDialog* _tmp74_ = NULL; - GtkAboutDialog* _tmp75_ = NULL; + SpitPluggableInfo _tmp48_; + GdkPixbuf** _tmp49_; + gint _tmp49__length1; + GtkAboutDialog* _tmp57_; + GtkAboutDialog* _tmp58_; + const gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + GtkAboutDialog* _tmp62_; + SpitPluggableInfo _tmp63_; + const gchar* _tmp64_; + GtkAboutDialog* _tmp65_; + SpitPluggableInfo _tmp66_; + const gchar* _tmp67_; + GtkAboutDialog* _tmp68_; + SpitPluggableInfo _tmp69_; + const gchar* _tmp70_; + GtkAboutDialog* _tmp71_; + SpitPluggableInfo _tmp72_; + const gchar* _tmp73_; + GtkAboutDialog* _tmp74_; + GtkAboutDialog* _tmp75_; #line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self)); #line 46 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -393,7 +393,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi #line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (!_tmp8_) { #line 396 "ManifestWidget.c" - const gchar* _tmp9_ = NULL; + const gchar* _tmp9_; #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp9_ = id; #line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -422,12 +422,12 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi if (_tmp11_ != NULL) { #line 424 "ManifestWidget.c" gchar** split = NULL; - SpitPluggableInfo _tmp12_ = {0}; - const gchar* _tmp13_ = NULL; - gchar** _tmp14_ = NULL; - gchar** _tmp15_ = NULL; - gint split_length1 = 0; - gint _split_size_ = 0; + SpitPluggableInfo _tmp12_; + const gchar* _tmp13_; + gchar** _tmp14_; + gchar** _tmp15_; + gint split_length1; + gint _split_size_; #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp12_ = info; #line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -453,21 +453,21 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" while (TRUE) { #line 456 "ManifestWidget.c" - gint _tmp18_ = 0; - gchar** _tmp19_ = NULL; - gint _tmp19__length1 = 0; + gint _tmp18_; + gchar** _tmp19_; + gint _tmp19__length1; gchar* stripped = NULL; - gchar** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - gint _tmp21_ = 0; - const gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; + gchar** _tmp20_; + gint _tmp20__length1; + gint _tmp21_; + const gchar* _tmp22_; + gchar* _tmp23_; + const gchar* _tmp24_; + gboolean _tmp25_; #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (!_tmp16_) { #line 470 "ManifestWidget.c" - gint _tmp17_ = 0; + gint _tmp17_; #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp17_ = ctr; #line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -507,12 +507,12 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi #line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (!_tmp25_) { #line 510 "ManifestWidget.c" - gchar** _tmp26_ = NULL; - gint _tmp26__length1 = 0; - gchar** _tmp28_ = NULL; - gint _tmp28__length1 = 0; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + gchar** _tmp26_; + gint _tmp26__length1; + gchar** _tmp28_; + gint _tmp28__length1; + const gchar* _tmp29_; + gchar* _tmp30_; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp26_ = authors; #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -520,7 +520,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi #line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp26_ == NULL) { #line 523 "ManifestWidget.c" - gchar** _tmp27_ = NULL; + gchar** _tmp27_; #line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp27_ = g_new0 (gchar*, 0 + 1); #line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -610,9 +610,9 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp49_ != NULL) { #line 613 "ManifestWidget.c" - SpitPluggableInfo _tmp50_ = {0}; - GdkPixbuf** _tmp51_ = NULL; - gint _tmp51__length1 = 0; + SpitPluggableInfo _tmp50_; + GdkPixbuf** _tmp51_; + gint _tmp51__length1; #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp50_ = info; #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -630,11 +630,11 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp47_) { #line 633 "ManifestWidget.c" - SpitPluggableInfo _tmp52_ = {0}; - GdkPixbuf** _tmp53_ = NULL; - gint _tmp53__length1 = 0; - GdkPixbuf* _tmp54_ = NULL; - GdkPixbuf* _tmp55_ = NULL; + SpitPluggableInfo _tmp52_; + GdkPixbuf** _tmp53_; + gint _tmp53__length1; + GdkPixbuf* _tmp54_; + GdkPixbuf* _tmp55_; #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp52_ = info; #line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -651,7 +651,7 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi _tmp46_ = _tmp55_; #line 653 "ManifestWidget.c" } else { - GdkPixbuf* _tmp56_ = NULL; + GdkPixbuf* _tmp56_; #line 82 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp56_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE); #line 82 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -743,13 +743,13 @@ static void plugins_manifest_widget_mediator_on_selection_changed (PluginsManife static void plugins_manifest_widget_mediator_set_about_button_sensitivity (PluginsManifestWidgetMediator* self) { gchar** ids = NULL; - PluginsManifestListView* _tmp0_ = NULL; - gint _tmp1_ = 0; - gchar** _tmp2_ = NULL; - gint ids_length1 = 0; - gint _ids_size_ = 0; - GtkButton* _tmp3_ = NULL; - GtkButton* _tmp4_ = NULL; + PluginsManifestListView* _tmp0_; + gint _tmp1_; + gchar** _tmp2_; + gint ids_length1; + gint _ids_size_; + GtkButton* _tmp3_; + GtkButton* _tmp4_; #line 98 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self)); #line 103 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -776,8 +776,8 @@ static void plugins_manifest_widget_mediator_set_about_button_sensitivity (Plugi GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMediator* self) { GtkWidget* result; - GtkBuilder* _tmp0_ = NULL; - GObject* _tmp1_ = NULL; + GtkBuilder* _tmp0_; + GObject* _tmp1_; #line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL); #line 12 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -794,8 +794,8 @@ GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMed static GtkButton* plugins_manifest_widget_mediator_get_about_button (PluginsManifestWidgetMediator* self) { GtkButton* result; - GtkBuilder* _tmp0_ = NULL; - GObject* _tmp1_ = NULL; + GtkBuilder* _tmp0_; + GObject* _tmp1_; #line 17 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL); #line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -812,8 +812,8 @@ static GtkButton* plugins_manifest_widget_mediator_get_about_button (PluginsMani static GtkScrolledWindow* plugins_manifest_widget_mediator_get_list_bin (PluginsManifestWidgetMediator* self) { GtkScrolledWindow* result; - GtkBuilder* _tmp0_ = NULL; - GObject* _tmp1_ = NULL; + GtkBuilder* _tmp0_; + GObject* _tmp1_; #line 23 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL); #line 24 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -870,7 +870,7 @@ static gchar* plugins_value_manifest_widget_mediator_collect_value (GValue* valu #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (collect_values[0].v_pointer) { #line 873 "ManifestWidget.c" - PluginsManifestWidgetMediator* object; + PluginsManifestWidgetMediator * object; object = collect_values[0].v_pointer; #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (object->parent_instance.g_class == NULL) { @@ -897,7 +897,7 @@ static gchar* plugins_value_manifest_widget_mediator_collect_value (GValue* valu static gchar* plugins_value_manifest_widget_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PluginsManifestWidgetMediator** object_p; + PluginsManifestWidgetMediator ** object_p; object_p = collect_values[0].v_pointer; #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (!object_p) { @@ -949,7 +949,7 @@ gpointer plugins_value_get_manifest_widget_mediator (const GValue* value) { void plugins_value_set_manifest_widget_mediator (GValue* value, gpointer v_object) { - PluginsManifestWidgetMediator* old; + PluginsManifestWidgetMediator * old; #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR)); #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -980,7 +980,7 @@ void plugins_value_set_manifest_widget_mediator (GValue* value, gpointer v_objec void plugins_value_take_manifest_widget_mediator (GValue* value, gpointer v_object) { - PluginsManifestWidgetMediator* old; + PluginsManifestWidgetMediator * old; #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR)); #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1020,8 +1020,8 @@ static void plugins_manifest_widget_mediator_class_init (PluginsManifestWidgetMe static void plugins_manifest_widget_mediator_instance_init (PluginsManifestWidgetMediator * self) { - GtkBuilder* _tmp0_ = NULL; - PluginsManifestListView* _tmp1_ = NULL; + GtkBuilder* _tmp0_; + PluginsManifestListView* _tmp1_; #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self->priv = PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_PRIVATE (self); #line 28 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1040,14 +1040,14 @@ static void plugins_manifest_widget_mediator_instance_init (PluginsManifestWidge } -static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator* obj) { +static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator * obj) { PluginsManifestWidgetMediator * self; - GtkButton* _tmp0_ = NULL; - GtkButton* _tmp1_ = NULL; - guint _tmp2_ = 0U; - PluginsManifestListView* _tmp3_ = NULL; - GtkTreeSelection* _tmp4_ = NULL; - guint _tmp5_ = 0U; + GtkButton* _tmp0_; + GtkButton* _tmp1_; + guint _tmp2_; + PluginsManifestListView* _tmp3_; + GtkTreeSelection* _tmp4_; + guint _tmp5_; #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediator); #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1091,7 +1091,7 @@ GType plugins_manifest_widget_mediator_get_type (void) { gpointer plugins_manifest_widget_mediator_ref (gpointer instance) { - PluginsManifestWidgetMediator* self; + PluginsManifestWidgetMediator * self; self = instance; #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_atomic_int_inc (&self->ref_count); @@ -1102,7 +1102,7 @@ gpointer plugins_manifest_widget_mediator_ref (gpointer instance) { void plugins_manifest_widget_mediator_unref (gpointer instance) { - PluginsManifestWidgetMediator* self; + PluginsManifestWidgetMediator * self; self = instance; #line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1147,39 +1147,39 @@ static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type) { PluginsManifestListView * self = NULL; - GtkTreeStore* _tmp0_ = NULL; + GtkTreeStore* _tmp0_; GtkCellRendererToggle* checkbox_renderer = NULL; - GtkCellRendererToggle* _tmp1_ = NULL; - GtkCellRendererToggle* _tmp2_ = NULL; - GtkCellRendererToggle* _tmp3_ = NULL; + GtkCellRendererToggle* _tmp1_; + GtkCellRendererToggle* _tmp2_; + GtkCellRendererToggle* _tmp3_; GtkCellRendererPixbuf* icon_renderer = NULL; - GtkCellRendererPixbuf* _tmp4_ = NULL; - GtkCellRendererPixbuf* _tmp5_ = NULL; - GtkCellRendererPixbuf* _tmp6_ = NULL; - GtkCellRendererPixbuf* _tmp7_ = NULL; + GtkCellRendererPixbuf* _tmp4_; + GtkCellRendererPixbuf* _tmp5_; + GtkCellRendererPixbuf* _tmp6_; + GtkCellRendererPixbuf* _tmp7_; GtkCellRendererText* text_renderer = NULL; - GtkCellRendererText* _tmp8_ = NULL; + GtkCellRendererText* _tmp8_; GtkTreeViewColumn* column = NULL; - GtkTreeViewColumn* _tmp9_ = NULL; - GtkTreeViewColumn* _tmp10_ = NULL; - GtkTreeViewColumn* _tmp11_ = NULL; - GtkCellRendererToggle* _tmp12_ = NULL; - GtkTreeViewColumn* _tmp13_ = NULL; - GtkCellRendererPixbuf* _tmp14_ = NULL; - GtkTreeViewColumn* _tmp15_ = NULL; - GtkCellRendererText* _tmp16_ = NULL; - GtkTreeViewColumn* _tmp17_ = NULL; - GtkCellRendererToggle* _tmp18_ = NULL; - GtkTreeViewColumn* _tmp19_ = NULL; - GtkCellRendererToggle* _tmp20_ = NULL; - GtkTreeViewColumn* _tmp21_ = NULL; - GtkCellRendererPixbuf* _tmp22_ = NULL; - GtkTreeViewColumn* _tmp23_ = NULL; - GtkCellRendererText* _tmp24_ = NULL; - GtkTreeViewColumn* _tmp25_ = NULL; - GtkTreeSelection* _tmp26_ = NULL; + GtkTreeViewColumn* _tmp9_; + GtkTreeViewColumn* _tmp10_; + GtkTreeViewColumn* _tmp11_; + GtkCellRendererToggle* _tmp12_; + GtkTreeViewColumn* _tmp13_; + GtkCellRendererPixbuf* _tmp14_; + GtkTreeViewColumn* _tmp15_; + GtkCellRendererText* _tmp16_; + GtkTreeViewColumn* _tmp17_; + GtkCellRendererToggle* _tmp18_; + GtkTreeViewColumn* _tmp19_; + GtkCellRendererToggle* _tmp20_; + GtkTreeViewColumn* _tmp21_; + GtkCellRendererPixbuf* _tmp22_; + GtkTreeViewColumn* _tmp23_; + GtkCellRendererText* _tmp24_; + GtkTreeViewColumn* _tmp25_; + GtkTreeSelection* _tmp26_; GtkIconTheme* icon_theme = NULL; - GtkIconTheme* _tmp27_ = NULL; + GtkIconTheme* _tmp27_; GError * _inner_error_ = NULL; #line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self = (PluginsManifestListView*) g_object_new (object_type, NULL); @@ -1304,10 +1304,10 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 1305 "ManifestWidget.c" { GeeIterator* _extension_point_it = NULL; - GeeCollection* _tmp28_ = NULL; - GeeCollection* _tmp29_ = NULL; - GeeIterator* _tmp30_ = NULL; - GeeIterator* _tmp31_ = NULL; + GeeCollection* _tmp28_; + GeeCollection* _tmp29_; + GeeIterator* _tmp30_; + GeeIterator* _tmp31_; #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp28_ = plugins_get_extension_points (_plugins_compare_extension_point_names_gcompare_data_func, NULL, NULL); #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1323,29 +1323,29 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" while (TRUE) { #line 1326 "ManifestWidget.c" - GeeIterator* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; + GeeIterator* _tmp32_; + gboolean _tmp33_; PluginsExtensionPoint* extension_point = NULL; - GeeIterator* _tmp34_ = NULL; - gpointer _tmp35_ = NULL; + GeeIterator* _tmp34_; + gpointer _tmp35_; GtkTreeIter category_iter = {0}; - GtkTreeStore* _tmp36_ = NULL; + GtkTreeStore* _tmp36_; GtkTreeIter _tmp37_ = {0}; GdkPixbuf* icon = NULL; - PluginsExtensionPoint* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - GtkTreeStore* _tmp59_ = NULL; - GtkTreeIter _tmp60_ = {0}; - PluginsExtensionPoint* _tmp61_ = NULL; - const gchar* _tmp62_ = NULL; - const gchar* _tmp63_ = NULL; - GdkPixbuf* _tmp64_ = NULL; + PluginsExtensionPoint* _tmp38_; + const gchar* _tmp39_; + const gchar* _tmp40_; + GtkTreeStore* _tmp59_; + GtkTreeIter _tmp60_; + PluginsExtensionPoint* _tmp61_; + const gchar* _tmp62_; + const gchar* _tmp63_; + GdkPixbuf* _tmp64_; GeeCollection* pluggables = NULL; - PluginsExtensionPoint* _tmp65_ = NULL; - GType _tmp66_ = 0UL; - GType _tmp67_ = 0UL; - GeeCollection* _tmp68_ = NULL; + PluginsExtensionPoint* _tmp65_; + GType _tmp66_; + GType _tmp67_; + GeeCollection* _tmp68_; #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp32_ = _extension_point_it; #line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1380,15 +1380,15 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type if (_tmp40_ != NULL) { #line 1382 "ManifestWidget.c" GtkIconInfo* icon_info = NULL; - GtkIconTheme* _tmp41_ = NULL; - PluginsExtensionPoint* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - GThemedIcon* _tmp45_ = NULL; - GThemedIcon* _tmp46_ = NULL; - GtkIconInfo* _tmp47_ = NULL; - GtkIconInfo* _tmp48_ = NULL; - GtkIconInfo* _tmp49_ = NULL; + GtkIconTheme* _tmp41_; + PluginsExtensionPoint* _tmp42_; + const gchar* _tmp43_; + const gchar* _tmp44_; + GThemedIcon* _tmp45_; + GThemedIcon* _tmp46_; + GtkIconInfo* _tmp47_; + GtkIconInfo* _tmp48_; + GtkIconInfo* _tmp49_; #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp41_ = icon_theme; #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1416,9 +1416,9 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 1417 "ManifestWidget.c" { GdkPixbuf* _tmp50_ = NULL; - GtkIconInfo* _tmp51_ = NULL; - GdkPixbuf* _tmp52_ = NULL; - GdkPixbuf* _tmp53_ = NULL; + GtkIconInfo* _tmp51_; + GdkPixbuf* _tmp52_; + GdkPixbuf* _tmp53_; #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp51_ = icon_info; #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1446,11 +1446,11 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type __catch37_g_error: { GError* err = NULL; - PluginsExtensionPoint* _tmp54_ = NULL; - const gchar* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - GError* _tmp57_ = NULL; - const gchar* _tmp58_ = NULL; + PluginsExtensionPoint* _tmp54_; + const gchar* _tmp55_; + const gchar* _tmp56_; + GError* _tmp57_; + const gchar* _tmp58_; #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" err = _inner_error_; #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1532,8 +1532,8 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 1533 "ManifestWidget.c" { GeeIterator* _pluggable_it = NULL; - GeeCollection* _tmp69_ = NULL; - GeeIterator* _tmp70_ = NULL; + GeeCollection* _tmp69_; + GeeIterator* _tmp70_; #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp69_ = pluggables; #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1543,36 +1543,36 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" while (TRUE) { #line 1546 "ManifestWidget.c" - GeeIterator* _tmp71_ = NULL; - gboolean _tmp72_ = FALSE; + GeeIterator* _tmp71_; + gboolean _tmp72_; SpitPluggable* pluggable = NULL; - GeeIterator* _tmp73_ = NULL; - gpointer _tmp74_ = NULL; + GeeIterator* _tmp73_; + gpointer _tmp74_; gboolean enabled = FALSE; - SpitPluggable* _tmp75_ = NULL; - const gchar* _tmp76_ = NULL; + SpitPluggable* _tmp75_; + const gchar* _tmp76_; gboolean _tmp77_ = FALSE; - gboolean _tmp78_ = FALSE; + gboolean _tmp78_; SpitPluggableInfo info = {0}; - SpitPluggable* _tmp79_ = NULL; + SpitPluggable* _tmp79_; GdkPixbuf* _tmp80_ = NULL; gboolean _tmp81_ = FALSE; - SpitPluggableInfo _tmp82_ = {0}; - GdkPixbuf** _tmp83_ = NULL; - gint _tmp83__length1 = 0; - GdkPixbuf* _tmp91_ = NULL; + SpitPluggableInfo _tmp82_; + GdkPixbuf** _tmp83_; + gint _tmp83__length1; + GdkPixbuf* _tmp91_; GtkTreeIter plugin_iter = {0}; - GtkTreeStore* _tmp92_ = NULL; - GtkTreeIter _tmp93_ = {0}; + GtkTreeStore* _tmp92_; + GtkTreeIter _tmp93_; GtkTreeIter _tmp94_ = {0}; - GtkTreeStore* _tmp95_ = NULL; - GtkTreeIter _tmp96_ = {0}; - gboolean _tmp97_ = FALSE; - SpitPluggable* _tmp98_ = NULL; - const gchar* _tmp99_ = NULL; - SpitPluggable* _tmp100_ = NULL; - const gchar* _tmp101_ = NULL; - GdkPixbuf* _tmp102_ = NULL; + GtkTreeStore* _tmp95_; + GtkTreeIter _tmp96_; + gboolean _tmp97_; + SpitPluggable* _tmp98_; + const gchar* _tmp99_; + SpitPluggable* _tmp100_; + const gchar* _tmp101_; + GdkPixbuf* _tmp102_; #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp71_ = _pluggable_it; #line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1620,9 +1620,9 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp83_ != NULL) { #line 1623 "ManifestWidget.c" - SpitPluggableInfo _tmp84_ = {0}; - GdkPixbuf** _tmp85_ = NULL; - gint _tmp85__length1 = 0; + SpitPluggableInfo _tmp84_; + GdkPixbuf** _tmp85_; + gint _tmp85__length1; #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp84_ = info; #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1640,11 +1640,11 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp81_) { #line 1643 "ManifestWidget.c" - SpitPluggableInfo _tmp86_ = {0}; - GdkPixbuf** _tmp87_ = NULL; - gint _tmp87__length1 = 0; - GdkPixbuf* _tmp88_ = NULL; - GdkPixbuf* _tmp89_ = NULL; + SpitPluggableInfo _tmp86_; + GdkPixbuf** _tmp87_; + gint _tmp87__length1; + GdkPixbuf* _tmp88_; + GdkPixbuf* _tmp89_; #line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp86_ = info; #line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1661,7 +1661,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type _tmp80_ = _tmp89_; #line 1663 "ManifestWidget.c" } else { - GdkPixbuf* _tmp90_ = NULL; + GdkPixbuf* _tmp90_; #line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp90_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE); #line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1758,7 +1758,7 @@ static gpointer _gtk_tree_path_copy0 (gpointer self) { } -static void _vala_array_add50 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add50 (gchar** * array, int* length, int* size, gchar* value) { #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if ((*length) == (*size)) { #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1794,15 +1794,15 @@ static void _g_list_free__gtk_tree_path_free0_ (GList* self) { gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, int* result_length1) { gchar** result = NULL; gchar** ids = NULL; - gchar** _tmp0_ = NULL; - gint ids_length1 = 0; - gint _ids_size_ = 0; + gchar** _tmp0_; + gint ids_length1; + gint _ids_size_; GList* selected = NULL; - GtkTreeSelection* _tmp1_ = NULL; - GList* _tmp2_ = NULL; - GList* _tmp3_ = NULL; - gchar** _tmp12_ = NULL; - gint _tmp12__length1 = 0; + GtkTreeSelection* _tmp1_; + GList* _tmp2_; + GList* _tmp3_; + gchar** _tmp12_; + gint _tmp12__length1; #line 214 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL); #line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1830,7 +1830,7 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se #line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" for (path_it = path_collection; path_it != NULL; path_it = path_it->next) { #line 1833 "ManifestWidget.c" - GtkTreePath* _tmp4_ = NULL; + GtkTreePath* _tmp4_; GtkTreePath* path = NULL; #line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp4_ = _gtk_tree_path_copy0 ((GtkTreePath*) path_it->data); @@ -1840,10 +1840,10 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se { GtkTreeIter iter = {0}; gchar* id = NULL; - GtkTreePath* _tmp5_ = NULL; + GtkTreePath* _tmp5_; GtkTreeIter _tmp6_ = {0}; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; + gchar* _tmp7_; + const gchar* _tmp8_; #line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp5_ = path; #line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1857,10 +1857,10 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se #line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp8_ != NULL) { #line 1860 "ManifestWidget.c" - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + gchar** _tmp9_; + gint _tmp9__length1; + const gchar* _tmp10_; + gchar* _tmp11_; #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp9_ = ids; #line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1904,15 +1904,15 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, GtkTreePath* path, GtkTreeIter* iter) { GtkTreeIter _vala_iter = {0}; gchar* result = NULL; - GtkTreeStore* _tmp0_ = NULL; - GtkTreePath* _tmp1_ = NULL; + GtkTreeStore* _tmp0_; + GtkTreePath* _tmp1_; GtkTreeIter _tmp2_ = {0}; - gboolean _tmp3_ = FALSE; + gboolean _tmp3_; const gchar* id = NULL; - GtkTreeStore* _tmp4_ = NULL; - GtkTreeIter _tmp5_ = {0}; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + GtkTreeStore* _tmp4_; + GtkTreeIter _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; #line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL); #line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -1970,34 +1970,34 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b GtkTreeViewColumn* col = NULL; gint cellx = 0; gint celly = 0; - GdkEventButton* _tmp0_ = NULL; - gdouble _tmp1_ = 0.0; - GdkEventButton* _tmp2_ = NULL; - gdouble _tmp3_ = 0.0; + GdkEventButton* _tmp0_; + gdouble _tmp1_; + GdkEventButton* _tmp2_; + gdouble _tmp3_; GtkTreePath* _tmp4_ = NULL; GtkTreeViewColumn* _tmp5_ = NULL; gint _tmp6_ = 0; gint _tmp7_ = 0; - gboolean _tmp8_ = FALSE; - GtkTreeViewColumn* _tmp9_ = NULL; + gboolean _tmp8_; + GtkTreeViewColumn* _tmp9_; gboolean _tmp12_ = FALSE; - gint _tmp13_ = 0; + gint _tmp13_; GtkTreeIter iter = {0}; gchar* id = NULL; - GtkTreePath* _tmp17_ = NULL; + GtkTreePath* _tmp17_; GtkTreeIter _tmp18_ = {0}; - gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; + gchar* _tmp19_; + const gchar* _tmp20_; gboolean enabled = FALSE; - const gchar* _tmp23_ = NULL; + const gchar* _tmp23_; gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; - gboolean _tmp28_ = FALSE; - const gchar* _tmp29_ = NULL; - gboolean _tmp30_ = FALSE; - GtkTreeStore* _tmp31_ = NULL; - GtkTreeIter _tmp32_ = {0}; - gboolean _tmp33_ = FALSE; + gboolean _tmp25_; + gboolean _tmp28_; + const gchar* _tmp29_; + gboolean _tmp30_; + GtkTreeStore* _tmp31_; + GtkTreeIter _tmp32_; + gboolean _tmp33_; #line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView); #line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -2029,8 +2029,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b #line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (!_tmp8_) { #line 2032 "ManifestWidget.c" - GdkEventButton* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GdkEventButton* _tmp10_; + gboolean _tmp11_; #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp10_ = event; #line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -2053,7 +2053,7 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b _tmp12_ = TRUE; #line 2055 "ManifestWidget.c" } else { - gint _tmp14_ = 0; + gint _tmp14_; #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp14_ = cellx; #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -2063,8 +2063,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b #line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp12_) { #line 2066 "ManifestWidget.c" - GdkEventButton* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GdkEventButton* _tmp15_; + gboolean _tmp16_; #line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp15_ = event; #line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -2092,8 +2092,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b #line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (_tmp20_ == NULL) { #line 2095 "ManifestWidget.c" - GdkEventButton* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; + GdkEventButton* _tmp21_; + gboolean _tmp22_; #line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp21_ = event; #line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -2119,8 +2119,8 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b #line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (!_tmp25_) { #line 2122 "ManifestWidget.c" - GdkEventButton* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; + GdkEventButton* _tmp26_; + gboolean _tmp27_; #line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp26_ = event; #line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -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 = (gboolean (*)(GtkWidget*, GdkEventButton*)) 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" @@ -2183,7 +2183,7 @@ static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass static void plugins_manifest_list_view_instance_init (PluginsManifestListView * self) { - GtkTreeStore* _tmp0_ = NULL; + GtkTreeStore* _tmp0_; #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self->priv = PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE (self); #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -2194,7 +2194,7 @@ static void plugins_manifest_list_view_instance_init (PluginsManifestListView * } -static void plugins_manifest_list_view_finalize (GObject* obj) { +static void plugins_manifest_list_view_finalize (GObject * obj) { PluginsManifestListView * self; #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView); diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c index aeda91e..3817292 100644 --- a/src/plugins/Plugins.c +++ b/src/plugins/Plugins.c @@ -1,4 +1,4 @@ -/* Plugins.c generated by valac 0.34.7, the Vala compiler +/* Plugins.c generated by valac 0.36.6, the Vala compiler * generated from Plugins.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -93,6 +93,11 @@ typedef struct _PluginsNotifierClass PluginsNotifierClass; typedef struct _PluginsNotifierPrivate PluginsNotifierPrivate; #define _plugins_notifier_unref0(var) ((var == NULL) ? NULL : (var = (plugins_notifier_unref (var), NULL))) typedef struct _PluginsParamSpecNotifier PluginsParamSpecNotifier; +enum { + PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL, + PLUGINS_NOTIFIER_LAST_SIGNAL +}; +static guint plugins_notifier_signals[PLUGINS_NOTIFIER_LAST_SIGNAL] = {0}; #define _plugins_extension_point_unref0(var) ((var == NULL) ? NULL : (var = (plugins_extension_point_unref (var), NULL))) #define _plugins_pluggable_rep_unref0(var) ((var == NULL) ? NULL : (var = (plugins_pluggable_rep_unref (var), NULL))) @@ -245,7 +250,7 @@ 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 void plugins_extension_point_finalize (PluginsExtensionPoint* obj); +static void plugins_extension_point_finalize (PluginsExtensionPoint * obj); gpointer plugins_module_rep_ref (gpointer instance); void plugins_module_rep_unref (gpointer instance); GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -259,7 +264,7 @@ enum { static PluginsModuleRep* plugins_module_rep_new (GFile* file); static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile* file); PluginsModuleRep* plugins_module_rep_open (GFile* file); -static void plugins_module_rep_finalize (PluginsModuleRep* obj); +static void plugins_module_rep_finalize (PluginsModuleRep * obj); gpointer plugins_pluggable_rep_ref (gpointer instance); void plugins_pluggable_rep_unref (gpointer instance); GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -291,12 +296,12 @@ gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self); gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean enabled); void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled); gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self); -static void plugins_pluggable_rep_finalize (PluginsPluggableRep* obj); +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_add47 (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_add48 (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); @@ -313,7 +318,7 @@ static PluginsNotifier* plugins_notifier_new (void); static PluginsNotifier* plugins_notifier_construct (GType object_type); PluginsNotifier* plugins_notifier_get_instance (void); static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void plugins_notifier_finalize (PluginsNotifier* obj); +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); @@ -329,7 +334,7 @@ GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable); gint plugins_compare_pluggable_names (void* a, void* b); gint plugins_compare_extension_point_names (void* a, void* b); gboolean plugins_is_shared_library (GFile* file); -void disassemble_filename (const gchar* basename, gchar** name, gchar** ext); +void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value" void plugins_load_module (GFile* file); GType prepare_input_text_options_get_type (void) G_GNUC_CONST; @@ -341,11 +346,11 @@ const gchar* PLUGINS_SHARED_LIB_EXTS[2] = {"so", "la"}; PluginsExtensionPoint* plugins_extension_point_construct (GType object_type, GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) { PluginsExtensionPoint* self = NULL; - GType _tmp0_ = 0UL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; + GType _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (name != NULL, NULL); #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -370,20 +375,20 @@ PluginsExtensionPoint* plugins_extension_point_construct (GType object_type, GTy plugins_extension_point_set_core_ids (self, _tmp3_, _tmp3__length1); #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self; -#line 374 "Plugins.c" +#line 379 "Plugins.c" } PluginsExtensionPoint* plugins_extension_point_new (GType pluggable_type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) { #line 25 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return plugins_extension_point_construct (PLUGINS_TYPE_EXTENSION_POINT, pluggable_type, name, icon_name, core_ids, core_ids_length1); -#line 381 "Plugins.c" +#line 386 "Plugins.c" } GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self) { GType result; - GType _tmp0_ = 0UL; + GType _tmp0_; #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_EXTENSION_POINT (self), 0UL); #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -392,25 +397,25 @@ GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self) { result = _tmp0_; #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 396 "Plugins.c" +#line 401 "Plugins.c" } static void plugins_extension_point_set_pluggable_type (PluginsExtensionPoint* self, GType value) { - GType _tmp0_ = 0UL; + GType _tmp0_; #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self)); #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = value; #line 19 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_pluggable_type = _tmp0_; -#line 408 "Plugins.c" +#line 413 "Plugins.c" } const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_EXTENSION_POINT (self), NULL); #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -419,13 +424,13 @@ const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self) { result = _tmp0_; #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 423 "Plugins.c" +#line 428 "Plugins.c" } static void plugins_extension_point_set_name (PluginsExtensionPoint* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self)); #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -436,13 +441,13 @@ static void plugins_extension_point_set_name (PluginsExtensionPoint* self, const _g_free0 (self->priv->_name); #line 21 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_name = _tmp1_; -#line 440 "Plugins.c" +#line 445 "Plugins.c" } const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_EXTENSION_POINT (self), NULL); #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -451,13 +456,13 @@ const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self) result = _tmp0_; #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 455 "Plugins.c" +#line 460 "Plugins.c" } static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self)); #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -468,16 +473,16 @@ static void plugins_extension_point_set_icon_name (PluginsExtensionPoint* self, _g_free0 (self->priv->_icon_name); #line 22 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_icon_name = _tmp1_; -#line 472 "Plugins.c" +#line 477 "Plugins.c" } gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* result_length1) { gchar** result; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_EXTENSION_POINT (self), NULL); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -492,13 +497,13 @@ gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* if (result_length1) { #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *result_length1 = _tmp1__length1; -#line 496 "Plugins.c" +#line 501 "Plugins.c" } #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = _tmp1_; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 502 "Plugins.c" +#line 507 "Plugins.c" } @@ -509,25 +514,25 @@ static gchar** _vala_array_dup18 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (i = 0; i < length; i++) { -#line 513 "Plugins.c" - gchar* _tmp0_ = NULL; +#line 518 "Plugins.c" + gchar* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = g_strdup (self[i]); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result[i] = _tmp0_; -#line 519 "Plugins.c" +#line 524 "Plugins.c" } #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 523 "Plugins.c" +#line 528 "Plugins.c" } static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, gchar** value, int value_length1) { - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_EXTENSION_POINT (self)); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -546,14 +551,14 @@ static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, g self->priv->_core_ids_length1 = _tmp1__length1; #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->__core_ids_size_ = self->priv->_core_ids_length1; -#line 550 "Plugins.c" +#line 555 "Plugins.c" } static void plugins_value_extension_point_init (GValue* value) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 557 "Plugins.c" +#line 562 "Plugins.c" } @@ -562,7 +567,7 @@ static void plugins_value_extension_point_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_point_unref (value->data[0].v_pointer); -#line 566 "Plugins.c" +#line 571 "Plugins.c" } } @@ -572,11 +577,11 @@ static void plugins_value_extension_point_copy_value (const GValue* src_value, G if (src_value->data[0].v_pointer) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = plugins_extension_point_ref (src_value->data[0].v_pointer); -#line 576 "Plugins.c" +#line 581 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = NULL; -#line 580 "Plugins.c" +#line 585 "Plugins.c" } } @@ -584,66 +589,66 @@ static void plugins_value_extension_point_copy_value (const GValue* src_value, G static gpointer plugins_value_extension_point_peek_pointer (const GValue* value) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 588 "Plugins.c" +#line 593 "Plugins.c" } static gchar* plugins_value_extension_point_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (collect_values[0].v_pointer) { -#line 595 "Plugins.c" - PluginsExtensionPoint* object; +#line 600 "Plugins.c" + PluginsExtensionPoint * object; object = collect_values[0].v_pointer; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (object->parent_instance.g_class == NULL) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 602 "Plugins.c" +#line 607 "Plugins.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 606 "Plugins.c" +#line 611 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = plugins_extension_point_ref (object); -#line 610 "Plugins.c" +#line 615 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 614 "Plugins.c" +#line 619 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 618 "Plugins.c" +#line 623 "Plugins.c" } static gchar* plugins_value_extension_point_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PluginsExtensionPoint** object_p; + PluginsExtensionPoint ** object_p; object_p = collect_values[0].v_pointer; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!object_p) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 629 "Plugins.c" +#line 634 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!value->data[0].v_pointer) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = NULL; -#line 635 "Plugins.c" +#line 640 "Plugins.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = value->data[0].v_pointer; -#line 639 "Plugins.c" +#line 644 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = plugins_extension_point_ref (value->data[0].v_pointer); -#line 643 "Plugins.c" +#line 648 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 647 "Plugins.c" +#line 652 "Plugins.c" } @@ -657,7 +662,7 @@ GParamSpec* plugins_param_spec_extension_point (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return G_PARAM_SPEC (spec); -#line 661 "Plugins.c" +#line 666 "Plugins.c" } @@ -666,12 +671,12 @@ gpointer plugins_value_get_extension_point (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT), NULL); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 670 "Plugins.c" +#line 675 "Plugins.c" } void plugins_value_set_extension_point (GValue* value, gpointer v_object) { - PluginsExtensionPoint* old; + PluginsExtensionPoint * old; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT)); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -686,23 +691,23 @@ void plugins_value_set_extension_point (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_point_ref (value->data[0].v_pointer); -#line 690 "Plugins.c" +#line 695 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 694 "Plugins.c" +#line 699 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_point_unref (old); -#line 700 "Plugins.c" +#line 705 "Plugins.c" } } void plugins_value_take_extension_point (GValue* value, gpointer v_object) { - PluginsExtensionPoint* old; + PluginsExtensionPoint * old; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_EXTENSION_POINT)); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -715,17 +720,17 @@ void plugins_value_take_extension_point (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = v_object; -#line 719 "Plugins.c" +#line 724 "Plugins.c" } else { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 723 "Plugins.c" +#line 728 "Plugins.c" } #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_extension_point_unref (old); -#line 729 "Plugins.c" +#line 734 "Plugins.c" } } @@ -737,7 +742,7 @@ static void plugins_extension_point_class_init (PluginsExtensionPointClass * kla ((PluginsExtensionPointClass *) klass)->finalize = plugins_extension_point_finalize; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_class_add_private (klass, sizeof (PluginsExtensionPointPrivate)); -#line 741 "Plugins.c" +#line 746 "Plugins.c" } @@ -746,11 +751,11 @@ static void plugins_extension_point_instance_init (PluginsExtensionPoint * self) self->priv = PLUGINS_EXTENSION_POINT_GET_PRIVATE (self); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->ref_count = 1; -#line 750 "Plugins.c" +#line 755 "Plugins.c" } -static void plugins_extension_point_finalize (PluginsExtensionPoint* obj) { +static void plugins_extension_point_finalize (PluginsExtensionPoint * obj) { PluginsExtensionPoint * self; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_EXTENSION_POINT, PluginsExtensionPoint); @@ -762,7 +767,7 @@ static void plugins_extension_point_finalize (PluginsExtensionPoint* obj) { _g_free0 (self->priv->_icon_name); #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_core_ids = (_vala_array_free (self->priv->_core_ids, self->priv->_core_ids_length1, (GDestroyNotify) g_free), NULL); -#line 766 "Plugins.c" +#line 771 "Plugins.c" } @@ -781,18 +786,18 @@ GType plugins_extension_point_get_type (void) { gpointer plugins_extension_point_ref (gpointer instance) { - PluginsExtensionPoint* self; + PluginsExtensionPoint * self; self = instance; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_atomic_int_inc (&self->ref_count); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return instance; -#line 791 "Plugins.c" +#line 796 "Plugins.c" } void plugins_extension_point_unref (gpointer instance) { - PluginsExtensionPoint* self; + PluginsExtensionPoint * self; self = instance; #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -800,7 +805,7 @@ void plugins_extension_point_unref (gpointer instance) { PLUGINS_EXTENSION_POINT_GET_CLASS (self)->finalize (self); #line 18 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_free_instance ((GTypeInstance *) self); -#line 804 "Plugins.c" +#line 809 "Plugins.c" } } @@ -808,18 +813,18 @@ void plugins_extension_point_unref (gpointer instance) { static gpointer _g_object_ref0 (gpointer self) { #line 41 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self ? g_object_ref (self) : NULL; -#line 812 "Plugins.c" +#line 817 "Plugins.c" } static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile* file) { PluginsModuleRep* self = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GModule* _tmp5_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GModule* _tmp5_; #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -848,33 +853,33 @@ static PluginsModuleRep* plugins_module_rep_construct (GType object_type, GFile* _g_free0 (_tmp4_); #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self; -#line 852 "Plugins.c" +#line 857 "Plugins.c" } static PluginsModuleRep* plugins_module_rep_new (GFile* file) { #line 40 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return plugins_module_rep_construct (PLUGINS_TYPE_MODULE_REP, file); -#line 859 "Plugins.c" +#line 864 "Plugins.c" } static gpointer _plugins_module_rep_ref0 (gpointer self) { #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self ? plugins_module_rep_ref (self) : NULL; -#line 866 "Plugins.c" +#line 871 "Plugins.c" } PluginsModuleRep* plugins_module_rep_open (GFile* file) { PluginsModuleRep* result = NULL; PluginsModuleRep* module_rep = NULL; - GFile* _tmp0_ = NULL; - PluginsModuleRep* _tmp1_ = NULL; + GFile* _tmp0_; + PluginsModuleRep* _tmp1_; PluginsModuleRep* _tmp2_ = NULL; - PluginsModuleRep* _tmp3_ = NULL; - GModule* _tmp4_ = NULL; - PluginsModuleRep* _tmp6_ = NULL; + PluginsModuleRep* _tmp3_; + GModule* _tmp4_; + PluginsModuleRep* _tmp6_; #line 54 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 55 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -889,17 +894,17 @@ PluginsModuleRep* plugins_module_rep_open (GFile* file) { _tmp4_ = _tmp3_->module; #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp4_ != NULL) { -#line 893 "Plugins.c" - PluginsModuleRep* _tmp5_ = NULL; +#line 898 "Plugins.c" + PluginsModuleRep* _tmp5_; #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = module_rep; #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = _tmp5_; -#line 899 "Plugins.c" +#line 904 "Plugins.c" } else { #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = NULL; -#line 903 "Plugins.c" +#line 908 "Plugins.c" } #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp6_ = _plugins_module_rep_ref0 (_tmp2_); @@ -909,14 +914,14 @@ PluginsModuleRep* plugins_module_rep_open (GFile* file) { _plugins_module_rep_unref0 (module_rep); #line 57 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 913 "Plugins.c" +#line 918 "Plugins.c" } static void plugins_value_module_rep_init (GValue* value) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 920 "Plugins.c" +#line 925 "Plugins.c" } @@ -925,7 +930,7 @@ static void plugins_value_module_rep_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_rep_unref (value->data[0].v_pointer); -#line 929 "Plugins.c" +#line 934 "Plugins.c" } } @@ -935,11 +940,11 @@ static void plugins_value_module_rep_copy_value (const GValue* src_value, GValue if (src_value->data[0].v_pointer) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = plugins_module_rep_ref (src_value->data[0].v_pointer); -#line 939 "Plugins.c" +#line 944 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = NULL; -#line 943 "Plugins.c" +#line 948 "Plugins.c" } } @@ -947,66 +952,66 @@ static void plugins_value_module_rep_copy_value (const GValue* src_value, GValue static gpointer plugins_value_module_rep_peek_pointer (const GValue* value) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 951 "Plugins.c" +#line 956 "Plugins.c" } static gchar* plugins_value_module_rep_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (collect_values[0].v_pointer) { -#line 958 "Plugins.c" - PluginsModuleRep* object; +#line 963 "Plugins.c" + PluginsModuleRep * object; object = collect_values[0].v_pointer; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (object->parent_instance.g_class == NULL) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 965 "Plugins.c" +#line 970 "Plugins.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 969 "Plugins.c" +#line 974 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = plugins_module_rep_ref (object); -#line 973 "Plugins.c" +#line 978 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 977 "Plugins.c" +#line 982 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 981 "Plugins.c" +#line 986 "Plugins.c" } static gchar* plugins_value_module_rep_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PluginsModuleRep** object_p; + PluginsModuleRep ** object_p; object_p = collect_values[0].v_pointer; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!object_p) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 992 "Plugins.c" +#line 997 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!value->data[0].v_pointer) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = NULL; -#line 998 "Plugins.c" +#line 1003 "Plugins.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = value->data[0].v_pointer; -#line 1002 "Plugins.c" +#line 1007 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = plugins_module_rep_ref (value->data[0].v_pointer); -#line 1006 "Plugins.c" +#line 1011 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 1010 "Plugins.c" +#line 1015 "Plugins.c" } @@ -1020,7 +1025,7 @@ GParamSpec* plugins_param_spec_module_rep (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return G_PARAM_SPEC (spec); -#line 1024 "Plugins.c" +#line 1029 "Plugins.c" } @@ -1029,12 +1034,12 @@ gpointer plugins_value_get_module_rep (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP), NULL); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 1033 "Plugins.c" +#line 1038 "Plugins.c" } void plugins_value_set_module_rep (GValue* value, gpointer v_object) { - PluginsModuleRep* old; + PluginsModuleRep * old; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP)); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1049,23 +1054,23 @@ void plugins_value_set_module_rep (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_rep_ref (value->data[0].v_pointer); -#line 1053 "Plugins.c" +#line 1058 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1057 "Plugins.c" +#line 1062 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_rep_unref (old); -#line 1063 "Plugins.c" +#line 1068 "Plugins.c" } } void plugins_value_take_module_rep (GValue* value, gpointer v_object) { - PluginsModuleRep* old; + PluginsModuleRep * old; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MODULE_REP)); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1078,17 +1083,17 @@ void plugins_value_take_module_rep (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = v_object; -#line 1082 "Plugins.c" +#line 1087 "Plugins.c" } else { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1086 "Plugins.c" +#line 1091 "Plugins.c" } #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_module_rep_unref (old); -#line 1092 "Plugins.c" +#line 1097 "Plugins.c" } } @@ -1098,7 +1103,7 @@ static void plugins_module_rep_class_init (PluginsModuleRepClass * klass) { plugins_module_rep_parent_class = g_type_class_peek_parent (klass); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" ((PluginsModuleRepClass *) klass)->finalize = plugins_module_rep_finalize; -#line 1102 "Plugins.c" +#line 1107 "Plugins.c" } @@ -1111,11 +1116,11 @@ static void plugins_module_rep_instance_init (PluginsModuleRep * self) { self->id = NULL; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->ref_count = 1; -#line 1115 "Plugins.c" +#line 1120 "Plugins.c" } -static void plugins_module_rep_finalize (PluginsModuleRep* obj) { +static void plugins_module_rep_finalize (PluginsModuleRep * obj) { PluginsModuleRep * self; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MODULE_REP, PluginsModuleRep); @@ -1133,7 +1138,7 @@ static void plugins_module_rep_finalize (PluginsModuleRep* obj) { _g_object_unref0 (self->spit_module); #line 38 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (self->id); -#line 1137 "Plugins.c" +#line 1142 "Plugins.c" } @@ -1152,18 +1157,18 @@ GType plugins_module_rep_get_type (void) { gpointer plugins_module_rep_ref (gpointer instance) { - PluginsModuleRep* self; + PluginsModuleRep * self; self = instance; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_atomic_int_inc (&self->ref_count); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return instance; -#line 1162 "Plugins.c" +#line 1167 "Plugins.c" } void plugins_module_rep_unref (gpointer instance) { - PluginsModuleRep* self; + PluginsModuleRep * self; self = instance; #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1171,16 +1176,16 @@ void plugins_module_rep_unref (gpointer instance) { PLUGINS_MODULE_REP_GET_CLASS (self)->finalize (self); #line 33 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1175 "Plugins.c" +#line 1180 "Plugins.c" } } PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type, SpitPluggable* pluggable) { PluginsPluggableRep* self = NULL; - SpitPluggable* _tmp0_ = NULL; - SpitPluggable* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + SpitPluggable* _tmp0_; + SpitPluggable* _tmp1_; + const gchar* _tmp2_; #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL); #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1197,31 +1202,31 @@ PluginsPluggableRep* plugins_pluggable_rep_construct (GType object_type, SpitPlu plugins_pluggable_rep_set_id (self, _tmp2_); #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self; -#line 1201 "Plugins.c" +#line 1206 "Plugins.c" } PluginsPluggableRep* plugins_pluggable_rep_new (SpitPluggable* pluggable) { #line 70 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return plugins_pluggable_rep_construct (PLUGINS_TYPE_PLUGGABLE_REP, pluggable); -#line 1208 "Plugins.c" +#line 1213 "Plugins.c" } void plugins_pluggable_rep_activate (PluginsPluggableRep* self) { - SpitPluggable* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPluggable* _tmp0_; + gboolean _tmp1_; FuzzyPropertyState saved_state = 0; - ConfigFacade* _tmp2_ = NULL; - ConfigFacade* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - FuzzyPropertyState _tmp5_ = 0; - FuzzyPropertyState _tmp6_ = 0; + ConfigFacade* _tmp2_; + ConfigFacade* _tmp3_; + const gchar* _tmp4_; + FuzzyPropertyState _tmp5_; + FuzzyPropertyState _tmp6_; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; - SpitPluggable* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + gboolean _tmp9_; + SpitPluggable* _tmp14_; + gboolean _tmp15_; #line 75 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 78 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1248,45 +1253,45 @@ void plugins_pluggable_rep_activate (PluginsPluggableRep* self) { _tmp9_ = self->priv->_is_core; #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp9_) { -#line 1252 "Plugins.c" - FuzzyPropertyState _tmp10_ = 0; +#line 1257 "Plugins.c" + FuzzyPropertyState _tmp10_; #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp10_ = saved_state; #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = _tmp10_ != FUZZY_PROPERTY_STATE_DISABLED; -#line 1258 "Plugins.c" +#line 1263 "Plugins.c" } else { #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = FALSE; -#line 1262 "Plugins.c" +#line 1267 "Plugins.c" } #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp8_) { #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp7_ = TRUE; -#line 1268 "Plugins.c" +#line 1273 "Plugins.c" } else { gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; + gboolean _tmp12_; #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp12_ = self->priv->_is_core; #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!_tmp12_) { -#line 1276 "Plugins.c" - FuzzyPropertyState _tmp13_ = 0; +#line 1281 "Plugins.c" + FuzzyPropertyState _tmp13_; #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp13_ = saved_state; #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = _tmp13_ == FUZZY_PROPERTY_STATE_ENABLED; -#line 1282 "Plugins.c" +#line 1287 "Plugins.c" } else { #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = FALSE; -#line 1286 "Plugins.c" +#line 1291 "Plugins.c" } #line 82 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp7_ = _tmp11_; -#line 1290 "Plugins.c" +#line 1295 "Plugins.c" } #line 81 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->enabled = _tmp7_; @@ -1298,13 +1303,13 @@ void plugins_pluggable_rep_activate (PluginsPluggableRep* self) { spit_pluggable_activation (_tmp14_, _tmp15_); #line 87 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_set_activated (self, TRUE); -#line 1302 "Plugins.c" +#line 1307 "Plugins.c" } gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 90 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE); #line 91 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1313,21 +1318,21 @@ gboolean plugins_pluggable_rep_is_enabled (PluginsPluggableRep* self) { result = _tmp0_; #line 91 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1317 "Plugins.c" +#line 1322 "Plugins.c" } gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean enabled) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - ConfigFacade* _tmp3_ = NULL; - ConfigFacade* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - SpitPluggable* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; + ConfigFacade* _tmp3_; + ConfigFacade* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; + SpitPluggable* _tmp7_; + gboolean _tmp8_; #line 95 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE); #line 96 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1340,7 +1345,7 @@ gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean result = FALSE; #line 97 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1344 "Plugins.c" +#line 1349 "Plugins.c" } #line 99 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = enabled; @@ -1368,13 +1373,13 @@ gboolean plugins_pluggable_rep_set_enabled (PluginsPluggableRep* self, gboolean result = TRUE; #line 103 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1372 "Plugins.c" +#line 1377 "Plugins.c" } SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self) { SpitPluggable* result; - SpitPluggable* _tmp0_ = NULL; + SpitPluggable* _tmp0_; #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), NULL); #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1383,13 +1388,13 @@ SpitPluggable* plugins_pluggable_rep_get_pluggable (PluginsPluggableRep* self) { result = _tmp0_; #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1387 "Plugins.c" +#line 1392 "Plugins.c" } static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, SpitPluggable* value) { - SpitPluggable* _tmp0_ = NULL; - SpitPluggable* _tmp1_ = NULL; + SpitPluggable* _tmp0_; + SpitPluggable* _tmp1_; #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1400,13 +1405,13 @@ static void plugins_pluggable_rep_set_pluggable (PluginsPluggableRep* self, Spit _g_object_unref0 (self->priv->_pluggable); #line 62 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_pluggable = _tmp1_; -#line 1404 "Plugins.c" +#line 1409 "Plugins.c" } const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), NULL); #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1415,13 +1420,13 @@ const gchar* plugins_pluggable_rep_get_id (PluginsPluggableRep* self) { result = _tmp0_; #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1419 "Plugins.c" +#line 1424 "Plugins.c" } static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1432,13 +1437,13 @@ static void plugins_pluggable_rep_set_id (PluginsPluggableRep* self, const gchar _g_free0 (self->priv->_id); #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_id = _tmp1_; -#line 1436 "Plugins.c" +#line 1441 "Plugins.c" } gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE); #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1447,25 +1452,25 @@ gboolean plugins_pluggable_rep_get_is_core (PluginsPluggableRep* self) { result = _tmp0_; #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1451 "Plugins.c" +#line 1456 "Plugins.c" } static void plugins_pluggable_rep_set_is_core (PluginsPluggableRep* self, gboolean value) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = value; #line 64 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_is_core = _tmp0_; -#line 1463 "Plugins.c" +#line 1468 "Plugins.c" } gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (PLUGINS_IS_PLUGGABLE_REP (self), FALSE); #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1474,26 +1479,26 @@ gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self) { result = _tmp0_; #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 1478 "Plugins.c" +#line 1483 "Plugins.c" } static void plugins_pluggable_rep_set_activated (PluginsPluggableRep* self, gboolean value) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (PLUGINS_IS_PLUGGABLE_REP (self)); #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = value; #line 65 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->priv->_activated = _tmp0_; -#line 1490 "Plugins.c" +#line 1495 "Plugins.c" } static void plugins_value_pluggable_rep_init (GValue* value) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1497 "Plugins.c" +#line 1502 "Plugins.c" } @@ -1502,7 +1507,7 @@ static void plugins_value_pluggable_rep_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_unref (value->data[0].v_pointer); -#line 1506 "Plugins.c" +#line 1511 "Plugins.c" } } @@ -1512,11 +1517,11 @@ static void plugins_value_pluggable_rep_copy_value (const GValue* src_value, GVa if (src_value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = plugins_pluggable_rep_ref (src_value->data[0].v_pointer); -#line 1516 "Plugins.c" +#line 1521 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = NULL; -#line 1520 "Plugins.c" +#line 1525 "Plugins.c" } } @@ -1524,66 +1529,66 @@ static void plugins_value_pluggable_rep_copy_value (const GValue* src_value, GVa static gpointer plugins_value_pluggable_rep_peek_pointer (const GValue* value) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 1528 "Plugins.c" +#line 1533 "Plugins.c" } static gchar* plugins_value_pluggable_rep_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (collect_values[0].v_pointer) { -#line 1535 "Plugins.c" - PluginsPluggableRep* object; +#line 1540 "Plugins.c" + PluginsPluggableRep * object; object = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (object->parent_instance.g_class == NULL) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1542 "Plugins.c" +#line 1547 "Plugins.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1546 "Plugins.c" +#line 1551 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = plugins_pluggable_rep_ref (object); -#line 1550 "Plugins.c" +#line 1555 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1554 "Plugins.c" +#line 1559 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 1558 "Plugins.c" +#line 1563 "Plugins.c" } static gchar* plugins_value_pluggable_rep_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PluginsPluggableRep** object_p; + PluginsPluggableRep ** object_p; object_p = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!object_p) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1569 "Plugins.c" +#line 1574 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = NULL; -#line 1575 "Plugins.c" +#line 1580 "Plugins.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = value->data[0].v_pointer; -#line 1579 "Plugins.c" +#line 1584 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = plugins_pluggable_rep_ref (value->data[0].v_pointer); -#line 1583 "Plugins.c" +#line 1588 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 1587 "Plugins.c" +#line 1592 "Plugins.c" } @@ -1597,7 +1602,7 @@ GParamSpec* plugins_param_spec_pluggable_rep (const gchar* name, const gchar* ni G_PARAM_SPEC (spec)->value_type = object_type; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return G_PARAM_SPEC (spec); -#line 1601 "Plugins.c" +#line 1606 "Plugins.c" } @@ -1606,12 +1611,12 @@ gpointer plugins_value_get_pluggable_rep (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP), NULL); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 1610 "Plugins.c" +#line 1615 "Plugins.c" } void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object) { - PluginsPluggableRep* old; + PluginsPluggableRep * old; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP)); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1626,23 +1631,23 @@ void plugins_value_set_pluggable_rep (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_ref (value->data[0].v_pointer); -#line 1630 "Plugins.c" +#line 1635 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1634 "Plugins.c" +#line 1639 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_unref (old); -#line 1640 "Plugins.c" +#line 1645 "Plugins.c" } } void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object) { - PluginsPluggableRep* old; + PluginsPluggableRep * old; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_PLUGGABLE_REP)); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1655,17 +1660,17 @@ void plugins_value_take_pluggable_rep (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = v_object; -#line 1659 "Plugins.c" +#line 1664 "Plugins.c" } else { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 1663 "Plugins.c" +#line 1668 "Plugins.c" } #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_pluggable_rep_unref (old); -#line 1669 "Plugins.c" +#line 1674 "Plugins.c" } } @@ -1677,7 +1682,7 @@ static void plugins_pluggable_rep_class_init (PluginsPluggableRepClass * klass) ((PluginsPluggableRepClass *) klass)->finalize = plugins_pluggable_rep_finalize; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_class_add_private (klass, sizeof (PluginsPluggableRepPrivate)); -#line 1681 "Plugins.c" +#line 1686 "Plugins.c" } @@ -1692,11 +1697,11 @@ static void plugins_pluggable_rep_instance_init (PluginsPluggableRep * self) { self->priv->enabled = FALSE; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->ref_count = 1; -#line 1696 "Plugins.c" +#line 1701 "Plugins.c" } -static void plugins_pluggable_rep_finalize (PluginsPluggableRep* obj) { +static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj) { PluginsPluggableRep * self; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_PLUGGABLE_REP, PluginsPluggableRep); @@ -1706,7 +1711,7 @@ static void plugins_pluggable_rep_finalize (PluginsPluggableRep* obj) { _g_object_unref0 (self->priv->_pluggable); #line 63 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (self->priv->_id); -#line 1710 "Plugins.c" +#line 1715 "Plugins.c" } @@ -1725,18 +1730,18 @@ GType plugins_pluggable_rep_get_type (void) { gpointer plugins_pluggable_rep_ref (gpointer instance) { - PluginsPluggableRep* self; + PluginsPluggableRep * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_atomic_int_inc (&self->ref_count); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return instance; -#line 1735 "Plugins.c" +#line 1740 "Plugins.c" } void plugins_pluggable_rep_unref (gpointer instance) { - PluginsPluggableRep* self; + PluginsPluggableRep * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1744,60 +1749,60 @@ void plugins_pluggable_rep_unref (gpointer instance) { PLUGINS_PLUGGABLE_REP_GET_CLASS (self)->finalize (self); #line 61 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1748 "Plugins.c" +#line 1753 "Plugins.c" } } -static void _vala_array_add47 (GFile*** array, int* length, int* size, GFile* value) { +static void _vala_array_add47 (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" *size = (*size) ? (2 * (*size)) : 4; #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 1760 "Plugins.c" +#line 1765 "Plugins.c" } #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" (*array)[(*length)++] = value; #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" (*array)[*length] = NULL; -#line 1766 "Plugins.c" +#line 1771 "Plugins.c" } -static void _vala_array_add48 (GFile*** array, int* length, int* size, GFile* value) { +static void _vala_array_add48 (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" *size = (*size) ? (2 * (*size)) : 4; #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 1777 "Plugins.c" +#line 1782 "Plugins.c" } #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" (*array)[(*length)++] = value; #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" (*array)[*length] = NULL; -#line 1783 "Plugins.c" +#line 1788 "Plugins.c" } void plugins_init (GError** error) { - GFile** _tmp0_ = NULL; - GFile** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - GFile* _tmp2_ = NULL; - GFile** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GFile* _tmp4_ = NULL; - GeeHashMap* _tmp5_ = NULL; - GeeHashMap* _tmp6_ = NULL; - GeeHashMap* _tmp7_ = NULL; - GeeHashSet* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - GFile** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + GFile** _tmp0_; + GFile** _tmp1_; + gint _tmp1__length1; + GFile* _tmp2_; + GFile** _tmp3_; + gint _tmp3__length1; + GFile* _tmp4_; + GeeHashMap* _tmp5_; + GeeHashMap* _tmp6_; + GeeHashMap* _tmp7_; + GeeHashSet* _tmp8_; + gboolean _tmp9_; + GFile** _tmp10_; + gint _tmp10__length1; GError * _inner_error_ = NULL; #line 114 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = g_new0 (GFile*, 0 + 1); @@ -1858,13 +1863,13 @@ void plugins_init (GError** error) { "latform."); #line 128 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 1861 "Plugins.c" +#line 1866 "Plugins.c" } #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp10_ = plugins_search_dirs; #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp10__length1 = plugins_search_dirs_length1; -#line 1867 "Plugins.c" +#line 1872 "Plugins.c" { GFile** dir_collection = NULL; gint dir_collection_length1 = 0; @@ -1876,24 +1881,24 @@ void plugins_init (GError** error) { dir_collection_length1 = _tmp10__length1; #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (dir_it = 0; dir_it < _tmp10__length1; dir_it = dir_it + 1) { -#line 1879 "Plugins.c" - GFile* _tmp11_ = NULL; +#line 1884 "Plugins.c" + GFile* _tmp11_; GFile* dir = NULL; #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = _g_object_ref0 (dir_collection[dir_it]); #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dir = _tmp11_; -#line 1886 "Plugins.c" +#line 1891 "Plugins.c" { { - GFile* _tmp12_ = NULL; + GFile* _tmp12_; #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp12_ = dir; #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_search_for_plugins (_tmp12_, &_inner_error_); #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1896 "Plugins.c" +#line 1901 "Plugins.c" goto __catch35_g_error; } } @@ -1901,11 +1906,11 @@ void plugins_init (GError** error) { __catch35_g_error: { GError* err = NULL; - GFile* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - GError* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + GError* _tmp16_; + const gchar* _tmp17_; #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" err = _inner_error_; #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1926,7 +1931,7 @@ void plugins_init (GError** error) { _g_free0 (_tmp15_); #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_error_free0 (err); -#line 1929 "Plugins.c" +#line 1934 "Plugins.c" } __finally35: #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -1937,11 +1942,11 @@ void plugins_init (GError** error) { _g_object_unref0 (dir); #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return; -#line 1940 "Plugins.c" +#line 1945 "Plugins.c" } #line 131 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (dir); -#line 1944 "Plugins.c" +#line 1949 "Plugins.c" } } } @@ -1973,7 +1978,7 @@ void plugins_terminate (void) { _g_object_unref0 (plugins_core_ids); #line 145 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_core_ids = NULL; -#line 1976 "Plugins.c" +#line 1981 "Plugins.c" } @@ -1983,42 +1988,42 @@ static PluginsNotifier* plugins_notifier_construct (GType object_type) { self = (PluginsNotifier*) g_type_create_instance (object_type); #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self; -#line 1986 "Plugins.c" +#line 1991 "Plugins.c" } static PluginsNotifier* plugins_notifier_new (void) { #line 153 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return plugins_notifier_construct (PLUGINS_TYPE_NOTIFIER); -#line 1993 "Plugins.c" +#line 1998 "Plugins.c" } static gpointer _plugins_notifier_ref0 (gpointer self) { #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return self ? plugins_notifier_ref (self) : NULL; -#line 2000 "Plugins.c" +#line 2005 "Plugins.c" } PluginsNotifier* plugins_notifier_get_instance (void) { PluginsNotifier* result = NULL; - PluginsNotifier* _tmp0_ = NULL; - PluginsNotifier* _tmp2_ = NULL; - PluginsNotifier* _tmp3_ = NULL; + PluginsNotifier* _tmp0_; + PluginsNotifier* _tmp2_; + PluginsNotifier* _tmp3_; #line 157 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_notifier_instance; #line 157 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp0_ == NULL) { -#line 2013 "Plugins.c" - PluginsNotifier* _tmp1_ = NULL; +#line 2018 "Plugins.c" + PluginsNotifier* _tmp1_; #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp1_ = plugins_notifier_new (); #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_notifier_unref0 (plugins_notifier_instance); #line 158 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_instance = _tmp1_; -#line 2021 "Plugins.c" +#line 2026 "Plugins.c" } #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = plugins_notifier_instance; @@ -2028,7 +2033,7 @@ PluginsNotifier* plugins_notifier_get_instance (void) { result = _tmp3_; #line 160 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2031 "Plugins.c" +#line 2036 "Plugins.c" } @@ -2047,26 +2052,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV data1 = closure->data; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" data2 = param_values->data[0].v_pointer; -#line 2050 "Plugins.c" +#line 2055 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" data1 = param_values->data[0].v_pointer; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" data2 = closure->data; -#line 2056 "Plugins.c" +#line 2061 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2); -#line 2062 "Plugins.c" +#line 2067 "Plugins.c" } static void plugins_value_notifier_init (GValue* value) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 2069 "Plugins.c" +#line 2074 "Plugins.c" } @@ -2075,7 +2080,7 @@ static void plugins_value_notifier_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_unref (value->data[0].v_pointer); -#line 2078 "Plugins.c" +#line 2083 "Plugins.c" } } @@ -2085,11 +2090,11 @@ static void plugins_value_notifier_copy_value (const GValue* src_value, GValue* if (src_value->data[0].v_pointer) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = plugins_notifier_ref (src_value->data[0].v_pointer); -#line 2088 "Plugins.c" +#line 2093 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" dest_value->data[0].v_pointer = NULL; -#line 2092 "Plugins.c" +#line 2097 "Plugins.c" } } @@ -2097,66 +2102,66 @@ static void plugins_value_notifier_copy_value (const GValue* src_value, GValue* static gpointer plugins_value_notifier_peek_pointer (const GValue* value) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 2100 "Plugins.c" +#line 2105 "Plugins.c" } static gchar* plugins_value_notifier_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (collect_values[0].v_pointer) { -#line 2107 "Plugins.c" - PluginsNotifier* object; +#line 2112 "Plugins.c" + PluginsNotifier * object; object = collect_values[0].v_pointer; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (object->parent_instance.g_class == NULL) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2114 "Plugins.c" +#line 2119 "Plugins.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2118 "Plugins.c" +#line 2123 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = plugins_notifier_ref (object); -#line 2122 "Plugins.c" +#line 2127 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 2126 "Plugins.c" +#line 2131 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 2130 "Plugins.c" +#line 2135 "Plugins.c" } static gchar* plugins_value_notifier_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PluginsNotifier** object_p; + PluginsNotifier ** object_p; object_p = collect_values[0].v_pointer; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!object_p) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2141 "Plugins.c" +#line 2146 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!value->data[0].v_pointer) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = NULL; -#line 2147 "Plugins.c" +#line 2152 "Plugins.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = value->data[0].v_pointer; -#line 2151 "Plugins.c" +#line 2156 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" *object_p = plugins_notifier_ref (value->data[0].v_pointer); -#line 2155 "Plugins.c" +#line 2160 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return NULL; -#line 2159 "Plugins.c" +#line 2164 "Plugins.c" } @@ -2170,7 +2175,7 @@ GParamSpec* plugins_param_spec_notifier (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return G_PARAM_SPEC (spec); -#line 2173 "Plugins.c" +#line 2178 "Plugins.c" } @@ -2179,12 +2184,12 @@ gpointer plugins_value_get_notifier (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER), NULL); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return value->data[0].v_pointer; -#line 2182 "Plugins.c" +#line 2187 "Plugins.c" } void plugins_value_set_notifier (GValue* value, gpointer v_object) { - PluginsNotifier* old; + PluginsNotifier * old; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER)); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2199,23 +2204,23 @@ void plugins_value_set_notifier (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_ref (value->data[0].v_pointer); -#line 2202 "Plugins.c" +#line 2207 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 2206 "Plugins.c" +#line 2211 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_unref (old); -#line 2212 "Plugins.c" +#line 2217 "Plugins.c" } } void plugins_value_take_notifier (GValue* value, gpointer v_object) { - PluginsNotifier* old; + PluginsNotifier * old; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_NOTIFIER)); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2228,17 +2233,17 @@ void plugins_value_take_notifier (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = v_object; -#line 2231 "Plugins.c" +#line 2236 "Plugins.c" } else { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" value->data[0].v_pointer = NULL; -#line 2235 "Plugins.c" +#line 2240 "Plugins.c" } #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (old) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_notifier_unref (old); -#line 2241 "Plugins.c" +#line 2246 "Plugins.c" } } @@ -2249,25 +2254,25 @@ static void plugins_notifier_class_init (PluginsNotifierClass * klass) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" ((PluginsNotifierClass *) klass)->finalize = plugins_notifier_finalize; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_signal_new ("pluggable_activation", PLUGINS_TYPE_NOTIFIER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SPIT_TYPE_PLUGGABLE, G_TYPE_BOOLEAN); -#line 2253 "Plugins.c" + plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL] = g_signal_new ("pluggable-activation", PLUGINS_TYPE_NOTIFIER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SPIT_TYPE_PLUGGABLE, G_TYPE_BOOLEAN); +#line 2258 "Plugins.c" } static void plugins_notifier_instance_init (PluginsNotifier * self) { #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self->ref_count = 1; -#line 2260 "Plugins.c" +#line 2265 "Plugins.c" } -static void plugins_notifier_finalize (PluginsNotifier* obj) { +static void plugins_notifier_finalize (PluginsNotifier * obj) { PluginsNotifier * self; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_NOTIFIER, PluginsNotifier); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_signal_handlers_destroy (self); -#line 2270 "Plugins.c" +#line 2275 "Plugins.c" } @@ -2286,18 +2291,18 @@ GType plugins_notifier_get_type (void) { gpointer plugins_notifier_ref (gpointer instance) { - PluginsNotifier* self; + PluginsNotifier * self; self = instance; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_atomic_int_inc (&self->ref_count); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return instance; -#line 2295 "Plugins.c" +#line 2300 "Plugins.c" } void plugins_notifier_unref (gpointer instance) { - PluginsNotifier* self; + PluginsNotifier * self; self = instance; #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2305,26 +2310,26 @@ void plugins_notifier_unref (gpointer instance) { PLUGINS_NOTIFIER_GET_CLASS (self)->finalize (self); #line 148 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2308 "Plugins.c" +#line 2313 "Plugins.c" } } void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1) { - GeeHashMap* _tmp0_ = NULL; - GType _tmp1_ = 0UL; - gboolean _tmp2_ = FALSE; - GeeHashMap* _tmp3_ = NULL; - GType _tmp4_ = 0UL; - GType _tmp5_ = 0UL; - const gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - PluginsExtensionPoint* _tmp9_ = NULL; - PluginsExtensionPoint* _tmp10_ = NULL; - gchar** _tmp11_ = NULL; - gint _tmp11__length1 = 0; + GeeHashMap* _tmp0_; + GType _tmp1_; + gboolean _tmp2_; + GeeHashMap* _tmp3_; + GType _tmp4_; + GType _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; + PluginsExtensionPoint* _tmp9_; + PluginsExtensionPoint* _tmp10_; + gchar** _tmp11_; + gint _tmp11__length1; #line 164 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (name != NULL); #line 166 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2363,14 +2368,14 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha _tmp11__length1 = core_ids_length1; #line 171 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp11_ != NULL) { -#line 2366 "Plugins.c" - gchar** _tmp12_ = NULL; - gint _tmp12__length1 = 0; +#line 2371 "Plugins.c" + gchar** _tmp12_; + gint _tmp12__length1; #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp12_ = core_ids; #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp12__length1 = core_ids_length1; -#line 2373 "Plugins.c" +#line 2378 "Plugins.c" { gchar** core_id_collection = NULL; gint core_id_collection_length1 = 0; @@ -2382,17 +2387,17 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha core_id_collection_length1 = _tmp12__length1; #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (core_id_it = 0; core_id_it < _tmp12__length1; core_id_it = core_id_it + 1) { -#line 2385 "Plugins.c" - gchar* _tmp13_ = NULL; +#line 2390 "Plugins.c" + gchar* _tmp13_; gchar* core_id = NULL; #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp13_ = g_strdup (core_id_collection[core_id_it]); #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" core_id = _tmp13_; -#line 2392 "Plugins.c" +#line 2397 "Plugins.c" { - GeeHashSet* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; + GeeHashSet* _tmp14_; + const gchar* _tmp15_; #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp14_ = plugins_core_ids; #line 173 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2401,19 +2406,19 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); #line 172 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (core_id); -#line 2404 "Plugins.c" +#line 2409 "Plugins.c" } } } } { GeeIterator* _pluggable_rep_it = NULL; - GeeHashMap* _tmp16_ = NULL; - GeeCollection* _tmp17_ = NULL; - GeeCollection* _tmp18_ = NULL; - GeeCollection* _tmp19_ = NULL; - GeeIterator* _tmp20_ = NULL; - GeeIterator* _tmp21_ = NULL; + GeeHashMap* _tmp16_; + GeeCollection* _tmp17_; + GeeCollection* _tmp18_; + GeeCollection* _tmp19_; + GeeIterator* _tmp20_; + GeeIterator* _tmp21_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp16_ = plugins_pluggable_table; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2432,26 +2437,26 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha _pluggable_rep_it = _tmp21_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 2435 "Plugins.c" - GeeIterator* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; +#line 2440 "Plugins.c" + GeeIterator* _tmp22_; + gboolean _tmp23_; PluginsPluggableRep* pluggable_rep = NULL; - GeeIterator* _tmp24_ = NULL; - gpointer _tmp25_ = NULL; - PluginsPluggableRep* _tmp26_ = NULL; - SpitPluggable* _tmp27_ = NULL; - SpitPluggable* _tmp28_ = NULL; - GType _tmp29_ = 0UL; - GType _tmp30_ = 0UL; - gboolean _tmp31_ = FALSE; - PluginsPluggableRep* _tmp32_ = NULL; - PluginsNotifier* _tmp33_ = NULL; - PluginsNotifier* _tmp34_ = NULL; - PluginsPluggableRep* _tmp35_ = NULL; - SpitPluggable* _tmp36_ = NULL; - SpitPluggable* _tmp37_ = NULL; - PluginsPluggableRep* _tmp38_ = NULL; - gboolean _tmp39_ = FALSE; + GeeIterator* _tmp24_; + gpointer _tmp25_; + PluginsPluggableRep* _tmp26_; + SpitPluggable* _tmp27_; + SpitPluggable* _tmp28_; + GType _tmp29_; + GType _tmp30_; + gboolean _tmp31_; + PluginsPluggableRep* _tmp32_; + PluginsNotifier* _tmp33_; + PluginsNotifier* _tmp34_; + PluginsPluggableRep* _tmp35_; + SpitPluggable* _tmp36_; + SpitPluggable* _tmp37_; + PluginsPluggableRep* _tmp38_; + gboolean _tmp39_; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp22_ = _pluggable_rep_it; #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2460,7 +2465,7 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha if (!_tmp23_) { #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 2463 "Plugins.c" +#line 2468 "Plugins.c" } #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp24_ = _pluggable_rep_it; @@ -2486,7 +2491,7 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha _plugins_pluggable_rep_unref0 (pluggable_rep); #line 179 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" continue; -#line 2489 "Plugins.c" +#line 2494 "Plugins.c" } #line 181 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp32_ = pluggable_rep; @@ -2507,16 +2512,16 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp39_ = plugins_pluggable_rep_is_enabled (_tmp38_); #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_signal_emit_by_name (_tmp34_, "pluggable-activation", _tmp37_, _tmp39_); + g_signal_emit (_tmp34_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp37_, _tmp39_); #line 182 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_notifier_unref0 (_tmp34_); #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 2515 "Plugins.c" +#line 2520 "Plugins.c" } #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_pluggable_rep_it); -#line 2519 "Plugins.c" +#line 2524 "Plugins.c" } } @@ -2524,20 +2529,20 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha GeeCollection* plugins_get_pluggables (gboolean include_disabled) { GeeCollection* result = NULL; GeeCollection* all = NULL; - GeeHashSet* _tmp0_ = NULL; + GeeHashSet* _tmp0_; #line 187 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _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" +#line 2537 "Plugins.c" { GeeIterator* _pluggable_rep_it = NULL; - GeeHashMap* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; + GeeHashMap* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + GeeIterator* _tmp5_; + GeeIterator* _tmp6_; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp1_ = plugins_pluggable_table; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2556,16 +2561,16 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) { _pluggable_rep_it = _tmp6_; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 2559 "Plugins.c" - GeeIterator* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; +#line 2564 "Plugins.c" + GeeIterator* _tmp7_; + gboolean _tmp8_; PluginsPluggableRep* pluggable_rep = NULL; - GeeIterator* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; + GeeIterator* _tmp9_; + gpointer _tmp10_; gboolean _tmp11_ = FALSE; - PluginsPluggableRep* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_ = FALSE; + PluginsPluggableRep* _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp7_ = _pluggable_rep_it; #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2574,7 +2579,7 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) { if (!_tmp8_) { #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 2577 "Plugins.c" +#line 2582 "Plugins.c" } #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp9_ = _pluggable_rep_it; @@ -2590,42 +2595,42 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) { _tmp14_ = _tmp13_; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp14_) { -#line 2593 "Plugins.c" +#line 2598 "Plugins.c" gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; + gboolean _tmp16_; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp16_ = include_disabled; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp16_) { #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp15_ = TRUE; -#line 2602 "Plugins.c" +#line 2607 "Plugins.c" } else { - PluginsPluggableRep* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; + PluginsPluggableRep* _tmp17_; + gboolean _tmp18_; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp17_ = pluggable_rep; #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp18_ = plugins_pluggable_rep_is_enabled (_tmp17_); #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp15_ = _tmp18_; -#line 2612 "Plugins.c" +#line 2617 "Plugins.c" } #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = _tmp15_; -#line 2616 "Plugins.c" +#line 2621 "Plugins.c" } else { #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = FALSE; -#line 2620 "Plugins.c" +#line 2625 "Plugins.c" } #line 189 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp11_) { -#line 2624 "Plugins.c" - GeeCollection* _tmp19_ = NULL; - PluginsPluggableRep* _tmp20_ = NULL; - SpitPluggable* _tmp21_ = NULL; - SpitPluggable* _tmp22_ = NULL; +#line 2629 "Plugins.c" + GeeCollection* _tmp19_; + PluginsPluggableRep* _tmp20_; + SpitPluggable* _tmp21_; + SpitPluggable* _tmp22_; #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp19_ = all; #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2636,30 +2641,30 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) { _tmp22_ = _tmp21_; #line 190 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" gee_collection_add (_tmp19_, _tmp22_); -#line 2639 "Plugins.c" +#line 2644 "Plugins.c" } #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 2643 "Plugins.c" +#line 2648 "Plugins.c" } #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_pluggable_rep_it); -#line 2647 "Plugins.c" +#line 2652 "Plugins.c" } #line 193 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = all; #line 193 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2653 "Plugins.c" +#line 2658 "Plugins.c" } gboolean plugins_is_core_pluggable (SpitPluggable* pluggable) { gboolean result = FALSE; - GeeHashSet* _tmp0_ = NULL; - SpitPluggable* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GeeHashSet* _tmp0_; + SpitPluggable* _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; #line 196 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), FALSE); #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2674,7 +2679,7 @@ gboolean plugins_is_core_pluggable (SpitPluggable* pluggable) { result = _tmp3_; #line 197 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2677 "Plugins.c" +#line 2682 "Plugins.c" } @@ -2685,17 +2690,17 @@ static SpitPluggable** _vala_array_dup19 (SpitPluggable** self, int length) { result = g_new0 (SpitPluggable*, length + 1); #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (i = 0; i < length; i++) { -#line 2688 "Plugins.c" - SpitPluggable* _tmp0_ = NULL; +#line 2693 "Plugins.c" + SpitPluggable* _tmp0_; #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result[i] = _tmp0_; -#line 2694 "Plugins.c" +#line 2699 "Plugins.c" } #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2698 "Plugins.c" +#line 2703 "Plugins.c" } @@ -2703,15 +2708,15 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { PluginsModuleRep* result = NULL; #line 200 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (needle), NULL); -#line 2706 "Plugins.c" +#line 2711 "Plugins.c" { GeeIterator* _module_rep_it = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeHashMap* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_module_table; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2730,23 +2735,23 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { _module_rep_it = _tmp5_; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 2733 "Plugins.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 2738 "Plugins.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; PluginsModuleRep* module_rep = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; SpitPluggable** pluggables = NULL; - PluginsModuleRep* _tmp10_ = NULL; - SpitModule* _tmp11_ = NULL; - gint _tmp12_ = 0; - SpitPluggable** _tmp13_ = NULL; - SpitPluggable** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - gint pluggables_length1 = 0; - gint _pluggables_size_ = 0; - SpitPluggable** _tmp15_ = NULL; - gint _tmp15__length1 = 0; + PluginsModuleRep* _tmp10_; + SpitModule* _tmp11_; + gint _tmp12_; + SpitPluggable** _tmp13_; + SpitPluggable** _tmp14_; + gint _tmp14__length1; + gint pluggables_length1; + gint _pluggables_size_; + SpitPluggable** _tmp15_; + gint _tmp15__length1; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp6_ = _module_rep_it; #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2755,7 +2760,7 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { if (!_tmp7_) { #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 2758 "Plugins.c" +#line 2763 "Plugins.c" } #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = _module_rep_it; @@ -2785,14 +2790,14 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { _tmp15__length1 = pluggables_length1; #line 203 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp15_ != NULL) { -#line 2788 "Plugins.c" - SpitPluggable** _tmp16_ = NULL; - gint _tmp16__length1 = 0; +#line 2793 "Plugins.c" + SpitPluggable** _tmp16_; + gint _tmp16__length1; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp16_ = pluggables; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp16__length1 = pluggables_length1; -#line 2795 "Plugins.c" +#line 2800 "Plugins.c" { SpitPluggable** pluggable_collection = NULL; gint pluggable_collection_length1 = 0; @@ -2804,17 +2809,17 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { pluggable_collection_length1 = _tmp16__length1; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" for (pluggable_it = 0; pluggable_it < _tmp16__length1; pluggable_it = pluggable_it + 1) { -#line 2807 "Plugins.c" - SpitPluggable* _tmp17_ = NULL; +#line 2812 "Plugins.c" + SpitPluggable* _tmp17_; SpitPluggable* pluggable = NULL; #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp17_ = _g_object_ref0 (pluggable_collection[pluggable_it]); #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" pluggable = _tmp17_; -#line 2814 "Plugins.c" +#line 2819 "Plugins.c" { - SpitPluggable* _tmp18_ = NULL; - SpitPluggable* _tmp19_ = NULL; + SpitPluggable* _tmp18_; + SpitPluggable* _tmp19_; #line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp18_ = pluggable; #line 205 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2831,11 +2836,11 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { _g_object_unref0 (_module_rep_it); #line 206 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2834 "Plugins.c" +#line 2839 "Plugins.c" } #line 204 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (pluggable); -#line 2838 "Plugins.c" +#line 2843 "Plugins.c" } } } @@ -2844,28 +2849,28 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) { pluggables = (_vala_array_free (pluggables, pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_module_rep_unref0 (module_rep); -#line 2847 "Plugins.c" +#line 2852 "Plugins.c" } #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_module_rep_it); -#line 2851 "Plugins.c" +#line 2856 "Plugins.c" } #line 211 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = NULL; #line 211 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2857 "Plugins.c" +#line 2862 "Plugins.c" } gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) { gchar* result = NULL; PluginsModuleRep* module_rep = NULL; - SpitPluggable* _tmp0_ = NULL; - PluginsModuleRep* _tmp1_ = NULL; + SpitPluggable* _tmp0_; + PluginsModuleRep* _tmp1_; const gchar* _tmp2_ = NULL; - PluginsModuleRep* _tmp3_ = NULL; - gchar* _tmp7_ = NULL; + PluginsModuleRep* _tmp3_; + gchar* _tmp7_; #line 214 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (needle), NULL); #line 215 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2878,10 +2883,10 @@ gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) { _tmp3_ = module_rep; #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp3_ != NULL) { -#line 2881 "Plugins.c" - PluginsModuleRep* _tmp4_ = NULL; - SpitModule* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; +#line 2886 "Plugins.c" + PluginsModuleRep* _tmp4_; + SpitModule* _tmp5_; + const gchar* _tmp6_; #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp4_ = module_rep; #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2890,11 +2895,11 @@ gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) { _tmp6_ = spit_module_get_id (_tmp5_); #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = _tmp6_; -#line 2893 "Plugins.c" +#line 2898 "Plugins.c" } else { #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = NULL; -#line 2897 "Plugins.c" +#line 2902 "Plugins.c" } #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp7_ = g_strdup (_tmp2_); @@ -2904,21 +2909,21 @@ gchar* plugins_get_pluggable_module_id (SpitPluggable* needle) { _plugins_module_rep_unref0 (module_rep); #line 217 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 2907 "Plugins.c" +#line 2912 "Plugins.c" } GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { GeeCollection* result = NULL; GeeCollection* sorted = NULL; - GCompareDataFunc _tmp0_ = NULL; - void* _tmp0__target = NULL; - GDestroyNotify _tmp0__target_destroy_notify = NULL; - GeeTreeSet* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; + GCompareDataFunc _tmp0_; + void* _tmp0__target; + GDestroyNotify _tmp0__target_destroy_notify; + GeeTreeSet* _tmp1_; + GeeHashMap* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = compare_func; #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2959,20 +2964,20 @@ 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 2962 "Plugins.c" +#line 2967 "Plugins.c" } GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled) { GeeCollection* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GType _tmp1_ = 0UL; - gboolean _tmp2_ = FALSE; + GeeHashMap* _tmp0_; + GType _tmp1_; + gboolean _tmp2_; GeeCollection* for_type = NULL; - GCompareDataFunc _tmp3_ = NULL; - void* _tmp3__target = NULL; - GDestroyNotify _tmp3__target_destroy_notify = NULL; - GeeTreeSet* _tmp4_ = NULL; + GCompareDataFunc _tmp3_; + void* _tmp3__target; + GDestroyNotify _tmp3__target_destroy_notify; + GeeTreeSet* _tmp4_; #line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = plugins_extension_points; #line 230 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -2997,15 +3002,15 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com _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 3000 "Plugins.c" +#line 3005 "Plugins.c" { GeeIterator* _pluggable_rep_it = NULL; - GeeHashMap* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; - GeeIterator* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; + GeeHashMap* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; + GeeIterator* _tmp9_; + GeeIterator* _tmp10_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = plugins_pluggable_table; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3024,17 +3029,17 @@ 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 3027 "Plugins.c" - GeeIterator* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#line 3032 "Plugins.c" + GeeIterator* _tmp11_; + gboolean _tmp12_; PluginsPluggableRep* pluggable_rep = NULL; - GeeIterator* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; + GeeIterator* _tmp13_; + gpointer _tmp14_; gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; - PluginsPluggableRep* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; - gboolean _tmp19_ = FALSE; + PluginsPluggableRep* _tmp17_; + gboolean _tmp18_; + gboolean _tmp19_; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = _pluggable_rep_it; #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3043,7 +3048,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 3046 "Plugins.c" +#line 3051 "Plugins.c" } #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp13_ = _pluggable_rep_it; @@ -3059,13 +3064,13 @@ 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 3062 "Plugins.c" - PluginsPluggableRep* _tmp20_ = NULL; - SpitPluggable* _tmp21_ = NULL; - SpitPluggable* _tmp22_ = NULL; - GType _tmp23_ = 0UL; - GType _tmp24_ = 0UL; - gboolean _tmp25_ = FALSE; +#line 3067 "Plugins.c" + PluginsPluggableRep* _tmp20_; + SpitPluggable* _tmp21_; + SpitPluggable* _tmp22_; + GType _tmp23_; + GType _tmp24_; + gboolean _tmp25_; #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp20_ = pluggable_rep; #line 235 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3080,50 +3085,50 @@ 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 3083 "Plugins.c" +#line 3088 "Plugins.c" } else { #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp16_ = FALSE; -#line 3087 "Plugins.c" +#line 3092 "Plugins.c" } #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp16_) { -#line 3091 "Plugins.c" +#line 3096 "Plugins.c" gboolean _tmp26_ = FALSE; - gboolean _tmp27_ = FALSE; + gboolean _tmp27_; #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp27_ = include_disabled; #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp27_) { #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp26_ = TRUE; -#line 3100 "Plugins.c" +#line 3105 "Plugins.c" } else { - PluginsPluggableRep* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; + PluginsPluggableRep* _tmp28_; + gboolean _tmp29_; #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp28_ = pluggable_rep; #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp29_ = plugins_pluggable_rep_is_enabled (_tmp28_); #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp26_ = _tmp29_; -#line 3110 "Plugins.c" +#line 3115 "Plugins.c" } #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp15_ = _tmp26_; -#line 3114 "Plugins.c" +#line 3119 "Plugins.c" } else { #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp15_ = FALSE; -#line 3118 "Plugins.c" +#line 3123 "Plugins.c" } #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp15_) { -#line 3122 "Plugins.c" - GeeCollection* _tmp30_ = NULL; - PluginsPluggableRep* _tmp31_ = NULL; - SpitPluggable* _tmp32_ = NULL; - SpitPluggable* _tmp33_ = NULL; +#line 3127 "Plugins.c" + GeeCollection* _tmp30_; + PluginsPluggableRep* _tmp31_; + SpitPluggable* _tmp32_; + SpitPluggable* _tmp33_; #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp30_ = for_type; #line 237 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3134,15 +3139,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 3137 "Plugins.c" +#line 3142 "Plugins.c" } #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 3141 "Plugins.c" +#line 3146 "Plugins.c" } #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_pluggable_rep_it); -#line 3145 "Plugins.c" +#line 3150 "Plugins.c" } #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" result = for_type; @@ -3156,20 +3161,20 @@ 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 3159 "Plugins.c" +#line 3164 "Plugins.c" } gchar* plugins_get_pluggable_name (const gchar* id) { gchar* result = NULL; PluginsPluggableRep* pluggable_rep = NULL; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; const gchar* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; - PluginsPluggableRep* _tmp5_ = NULL; - gchar* _tmp13_ = NULL; + PluginsPluggableRep* _tmp5_; + gchar* _tmp13_; #line 244 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (id != NULL, NULL); #line 245 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3184,10 +3189,10 @@ 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 3187 "Plugins.c" - PluginsPluggableRep* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; +#line 3192 "Plugins.c" + PluginsPluggableRep* _tmp6_; + gboolean _tmp7_; + gboolean _tmp8_; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp6_ = pluggable_rep; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3196,19 +3201,19 @@ gchar* plugins_get_pluggable_name (const gchar* id) { _tmp8_ = _tmp7_; #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp4_ = _tmp8_; -#line 3199 "Plugins.c" +#line 3204 "Plugins.c" } else { #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp4_ = FALSE; -#line 3203 "Plugins.c" +#line 3208 "Plugins.c" } #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp4_) { -#line 3207 "Plugins.c" - PluginsPluggableRep* _tmp9_ = NULL; - SpitPluggable* _tmp10_ = NULL; - SpitPluggable* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; +#line 3212 "Plugins.c" + PluginsPluggableRep* _tmp9_; + SpitPluggable* _tmp10_; + SpitPluggable* _tmp11_; + const gchar* _tmp12_; #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp9_ = pluggable_rep; #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3219,11 +3224,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 3222 "Plugins.c" +#line 3227 "Plugins.c" } else { #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = NULL; -#line 3226 "Plugins.c" +#line 3231 "Plugins.c" } #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp13_ = g_strdup (_tmp3_); @@ -3233,21 +3238,21 @@ 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 3236 "Plugins.c" +#line 3241 "Plugins.c" } gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info) { gboolean result = FALSE; PluginsPluggableRep* pluggable_rep = NULL; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; gboolean _tmp3_ = FALSE; - PluginsPluggableRep* _tmp4_ = NULL; - PluginsPluggableRep* _tmp8_ = NULL; - SpitPluggable* _tmp9_ = NULL; - SpitPluggable* _tmp10_ = NULL; + PluginsPluggableRep* _tmp4_; + PluginsPluggableRep* _tmp8_; + SpitPluggable* _tmp9_; + SpitPluggable* _tmp10_; #line 251 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (id != NULL, FALSE); #line 251 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3266,11 +3271,11 @@ 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 3269 "Plugins.c" +#line 3274 "Plugins.c" } else { - PluginsPluggableRep* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; + PluginsPluggableRep* _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = pluggable_rep; #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3279,7 +3284,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 3282 "Plugins.c" +#line 3287 "Plugins.c" } #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp3_) { @@ -3289,7 +3294,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 3292 "Plugins.c" +#line 3297 "Plugins.c" } #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = pluggable_rep; @@ -3305,7 +3310,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 3308 "Plugins.c" +#line 3313 "Plugins.c" } @@ -3313,13 +3318,13 @@ gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled) { gboolean _vala_enabled = FALSE; gboolean result = FALSE; PluginsPluggableRep* pluggable_rep = NULL; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; gboolean _tmp3_ = FALSE; - PluginsPluggableRep* _tmp4_ = NULL; - PluginsPluggableRep* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + PluginsPluggableRep* _tmp4_; + PluginsPluggableRep* _tmp8_; + gboolean _tmp9_; #line 261 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (id != NULL, FALSE); #line 262 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3336,11 +3341,11 @@ 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 3339 "Plugins.c" +#line 3344 "Plugins.c" } else { - PluginsPluggableRep* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; + PluginsPluggableRep* _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = pluggable_rep; #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3349,7 +3354,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 3352 "Plugins.c" +#line 3357 "Plugins.c" } #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp3_) { @@ -3363,11 +3368,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 3366 "Plugins.c" +#line 3371 "Plugins.c" } #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3370 "Plugins.c" +#line 3375 "Plugins.c" } #line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = pluggable_rep; @@ -3383,24 +3388,24 @@ 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 3386 "Plugins.c" +#line 3391 "Plugins.c" } #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3390 "Plugins.c" +#line 3395 "Plugins.c" } void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) { PluginsPluggableRep* pluggable_rep = NULL; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; gboolean _tmp3_ = FALSE; - PluginsPluggableRep* _tmp4_ = NULL; - PluginsPluggableRep* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; + PluginsPluggableRep* _tmp4_; + PluginsPluggableRep* _tmp8_; + gboolean _tmp9_; + gboolean _tmp10_; #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (id != NULL); #line 275 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3417,11 +3422,11 @@ 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 3420 "Plugins.c" +#line 3425 "Plugins.c" } else { - PluginsPluggableRep* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; + PluginsPluggableRep* _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = pluggable_rep; #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3430,7 +3435,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 3433 "Plugins.c" +#line 3438 "Plugins.c" } #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp3_) { @@ -3438,7 +3443,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 3441 "Plugins.c" +#line 3446 "Plugins.c" } #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = pluggable_rep; @@ -3448,13 +3453,13 @@ 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 3451 "Plugins.c" - PluginsNotifier* _tmp11_ = NULL; - PluginsNotifier* _tmp12_ = NULL; - PluginsPluggableRep* _tmp13_ = NULL; - SpitPluggable* _tmp14_ = NULL; - SpitPluggable* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; +#line 3456 "Plugins.c" + PluginsNotifier* _tmp11_; + PluginsNotifier* _tmp12_; + PluginsPluggableRep* _tmp13_; + SpitPluggable* _tmp14_; + SpitPluggable* _tmp15_; + gboolean _tmp16_; #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = plugins_notifier_get_instance (); #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3468,25 +3473,25 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) { #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp16_ = enabled; #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_signal_emit_by_name (_tmp12_, "pluggable-activation", _tmp15_, _tmp16_); + g_signal_emit (_tmp12_, plugins_notifier_signals[PLUGINS_NOTIFIER_PLUGGABLE_ACTIVATION_SIGNAL], 0, _tmp15_, _tmp16_); #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_notifier_unref0 (_tmp12_); -#line 3474 "Plugins.c" +#line 3479 "Plugins.c" } #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _plugins_pluggable_rep_unref0 (pluggable_rep); -#line 3478 "Plugins.c" +#line 3483 "Plugins.c" } GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) { GFile* result = NULL; PluginsModuleRep* module_rep = NULL; - SpitPluggable* _tmp0_ = NULL; - PluginsModuleRep* _tmp1_ = NULL; + SpitPluggable* _tmp0_; + PluginsModuleRep* _tmp1_; GFile* _tmp2_ = NULL; - PluginsModuleRep* _tmp3_ = NULL; - GFile* _tmp6_ = NULL; + PluginsModuleRep* _tmp3_; + GFile* _tmp6_; #line 283 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL); #line 284 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3499,20 +3504,20 @@ 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 3502 "Plugins.c" - PluginsModuleRep* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; +#line 3507 "Plugins.c" + PluginsModuleRep* _tmp4_; + GFile* _tmp5_; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp4_ = module_rep; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = _tmp4_->file; #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = _tmp5_; -#line 3511 "Plugins.c" +#line 3516 "Plugins.c" } else { #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = NULL; -#line 3515 "Plugins.c" +#line 3520 "Plugins.c" } #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp6_ = _g_object_ref0 (_tmp2_); @@ -3522,19 +3527,19 @@ 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 3525 "Plugins.c" +#line 3530 "Plugins.c" } gint plugins_compare_pluggable_names (void* a, void* b) { gint result = 0; SpitPluggable* apluggable = NULL; - void* _tmp0_ = NULL; + void* _tmp0_; SpitPluggable* bpluggable = NULL; - void* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; + void* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gint _tmp4_; #line 290 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = a; #line 290 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3553,21 +3558,21 @@ gint plugins_compare_pluggable_names (void* a, void* b) { result = _tmp4_; #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3556 "Plugins.c" +#line 3561 "Plugins.c" } gint plugins_compare_extension_point_names (void* a, void* b) { gint result = 0; PluginsExtensionPoint* apoint = NULL; - void* _tmp0_ = NULL; + void* _tmp0_; PluginsExtensionPoint* bpoint = NULL; - void* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gint _tmp6_ = 0; + void* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + gint _tmp6_; #line 297 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp0_ = a; #line 297 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3590,7 +3595,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 3593 "Plugins.c" +#line 3598 "Plugins.c" } @@ -3598,9 +3603,9 @@ gboolean plugins_is_shared_library (GFile* file) { gboolean result = FALSE; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; #line 303 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3623,7 +3628,7 @@ gboolean plugins_is_shared_library (GFile* file) { ext = _tmp4_; #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (_tmp2_); -#line 3626 "Plugins.c" +#line 3631 "Plugins.c" { const gchar** shared_ext_collection = NULL; gint shared_ext_collection_length1 = 0; @@ -3635,17 +3640,17 @@ 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 3638 "Plugins.c" - gchar* _tmp5_ = NULL; +#line 3643 "Plugins.c" + gchar* _tmp5_; 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 3645 "Plugins.c" +#line 3650 "Plugins.c" { - const gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + const gchar* _tmp6_; + const gchar* _tmp7_; #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp6_ = ext; #line 308 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3662,11 +3667,11 @@ gboolean plugins_is_shared_library (GFile* file) { _g_free0 (name); #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3665 "Plugins.c" +#line 3670 "Plugins.c" } #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (shared_ext); -#line 3669 "Plugins.c" +#line 3674 "Plugins.c" } } } @@ -3678,17 +3683,17 @@ gboolean plugins_is_shared_library (GFile* file) { _g_free0 (name); #line 312 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" return result; -#line 3681 "Plugins.c" +#line 3686 "Plugins.c" } void plugins_search_for_plugins (GFile* dir, GError** error) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; GFileEnumerator* enumerator = NULL; - GFile* _tmp3_ = NULL; - GFileEnumerator* _tmp4_ = NULL; + GFile* _tmp3_; + GFileEnumerator* _tmp4_; GError * _inner_error_ = NULL; #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_IS_FILE (dir)); @@ -3714,7 +3719,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 3717 "Plugins.c" +#line 3722 "Plugins.c" } { gboolean _tmp5_ = FALSE; @@ -3722,23 +3727,23 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _tmp5_ = TRUE; #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" while (TRUE) { -#line 3725 "Plugins.c" +#line 3730 "Plugins.c" GFileInfo* info = NULL; - GFileEnumerator* _tmp6_ = NULL; - GFileInfo* _tmp7_ = NULL; - GFileInfo* _tmp8_ = NULL; - GFileInfo* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + GFileEnumerator* _tmp6_; + GFileInfo* _tmp7_; + GFileInfo* _tmp8_; + GFileInfo* _tmp9_; + gboolean _tmp10_; GFile* file = NULL; - GFile* _tmp11_ = NULL; - GFileInfo* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - GFileInfo* _tmp15_ = NULL; - GFileType _tmp16_ = 0; + GFile* _tmp11_; + GFileInfo* _tmp12_; + const gchar* _tmp13_; + GFile* _tmp14_; + GFileInfo* _tmp15_; + GFileType _tmp16_; #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!_tmp5_) { -#line 3741 "Plugins.c" +#line 3746 "Plugins.c" } #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp5_ = FALSE; @@ -3756,7 +3761,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 3759 "Plugins.c" +#line 3764 "Plugins.c" } #line 324 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp8_ = info; @@ -3766,7 +3771,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 3769 "Plugins.c" +#line 3774 "Plugins.c" } #line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp9_ = info; @@ -3778,7 +3783,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 3781 "Plugins.c" +#line 3786 "Plugins.c" } #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = dir; @@ -3798,17 +3803,17 @@ 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 3801 "Plugins.c" +#line 3806 "Plugins.c" { { - GFile* _tmp17_ = NULL; + GFile* _tmp17_; #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp17_ = file; #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" plugins_search_for_plugins (_tmp17_, &_inner_error_); #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3811 "Plugins.c" +#line 3816 "Plugins.c" goto __catch36_g_error; } } @@ -3816,11 +3821,11 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { __catch36_g_error: { GError* err = NULL; - GFile* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - GError* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; + GFile* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + GError* _tmp21_; + const gchar* _tmp22_; #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" err = _inner_error_; #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3841,7 +3846,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 3844 "Plugins.c" +#line 3849 "Plugins.c" } __finally36: #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3856,117 +3861,117 @@ 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 3859 "Plugins.c" +#line 3864 "Plugins.c" } #line 339 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3863 "Plugins.c" +#line 3868 "Plugins.c" } #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" case G_FILE_TYPE_REGULAR: -#line 3867 "Plugins.c" +#line 3872 "Plugins.c" { - GFile* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; + GFile* _tmp23_; + gboolean _tmp24_; #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp23_ = file; #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp24_ = plugins_is_shared_library (_tmp23_); #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp24_) { -#line 3877 "Plugins.c" - GFile* _tmp25_ = NULL; +#line 3882 "Plugins.c" + GFile* _tmp25_; #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 3883 "Plugins.c" +#line 3888 "Plugins.c" } #line 344 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3887 "Plugins.c" +#line 3892 "Plugins.c" } default: { #line 348 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" break; -#line 3893 "Plugins.c" +#line 3898 "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 3900 "Plugins.c" +#line 3905 "Plugins.c" } } #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (enumerator); -#line 3905 "Plugins.c" +#line 3910 "Plugins.c" } void plugins_load_module (GFile* file) { PluginsModuleRep* module_rep = NULL; - GFile* _tmp0_ = NULL; - PluginsModuleRep* _tmp1_ = NULL; - PluginsModuleRep* _tmp2_ = NULL; + GFile* _tmp0_; + PluginsModuleRep* _tmp1_; + PluginsModuleRep* _tmp2_; void* entry = NULL; - PluginsModuleRep* _tmp7_ = NULL; - GModule* _tmp8_ = NULL; + PluginsModuleRep* _tmp7_; + GModule* _tmp8_; void* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + gboolean _tmp10_; SpitEntryPoint spit_entry_point = NULL; - void* _tmp14_ = NULL; + void* _tmp14_; gboolean _tmp15_ = FALSE; SpitEntryPointParams params = {0}; - GFile* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - PluginsModuleRep* _tmp18_ = NULL; - SpitEntryPoint _tmp19_ = NULL; - SpitModule* _tmp20_ = NULL; - SpitEntryPointParams _tmp21_ = {0}; - gint _tmp22_ = 0; + GFile* _tmp16_; + GFile* _tmp17_; + PluginsModuleRep* _tmp18_; + SpitEntryPoint _tmp19_; + SpitModule* _tmp20_; + SpitEntryPointParams _tmp21_; + gint _tmp22_; gboolean _tmp26_ = FALSE; - SpitEntryPointParams _tmp27_ = {0}; - gint _tmp28_ = 0; - PluginsModuleRep* _tmp36_ = NULL; - SpitEntryPointParams _tmp37_ = {0}; - gint _tmp38_ = 0; - PluginsModuleRep* _tmp39_ = NULL; - SpitModule* _tmp40_ = NULL; - PluginsModuleRep* _tmp42_ = NULL; - SpitModule* _tmp43_ = NULL; - PluginsModuleRep* _tmp49_ = NULL; - PluginsModuleRep* _tmp50_ = NULL; - SpitModule* _tmp51_ = NULL; - const gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - PluginsModuleRep* _tmp54_ = NULL; - const gchar* _tmp55_ = NULL; - GeeHashMap* _tmp61_ = NULL; - PluginsModuleRep* _tmp62_ = NULL; - const gchar* _tmp63_ = NULL; - gboolean _tmp64_ = FALSE; - PluginsModuleRep* _tmp72_ = NULL; - SpitModule* _tmp73_ = NULL; - const gchar* _tmp74_ = NULL; - PluginsModuleRep* _tmp75_ = NULL; - SpitModule* _tmp76_ = NULL; - const gchar* _tmp77_ = NULL; - PluginsModuleRep* _tmp78_ = NULL; - const gchar* _tmp79_ = NULL; - GFile* _tmp80_ = NULL; - gchar* _tmp81_ = NULL; - gchar* _tmp82_ = NULL; - GeeHashMap* _tmp83_ = NULL; - PluginsModuleRep* _tmp84_ = NULL; - const gchar* _tmp85_ = NULL; - PluginsModuleRep* _tmp86_ = NULL; - PluginsModuleRep* _tmp87_ = NULL; - SpitModule* _tmp88_ = NULL; - gint _tmp89_ = 0; - SpitPluggable** _tmp90_ = NULL; + SpitEntryPointParams _tmp27_; + gint _tmp28_; + PluginsModuleRep* _tmp36_; + SpitEntryPointParams _tmp37_; + gint _tmp38_; + PluginsModuleRep* _tmp39_; + SpitModule* _tmp40_; + PluginsModuleRep* _tmp42_; + SpitModule* _tmp43_; + PluginsModuleRep* _tmp49_; + PluginsModuleRep* _tmp50_; + SpitModule* _tmp51_; + const gchar* _tmp52_; + gchar* _tmp53_; + PluginsModuleRep* _tmp54_; + const gchar* _tmp55_; + GeeHashMap* _tmp61_; + PluginsModuleRep* _tmp62_; + const gchar* _tmp63_; + gboolean _tmp64_; + PluginsModuleRep* _tmp72_; + SpitModule* _tmp73_; + const gchar* _tmp74_; + PluginsModuleRep* _tmp75_; + SpitModule* _tmp76_; + const gchar* _tmp77_; + PluginsModuleRep* _tmp78_; + const gchar* _tmp79_; + GFile* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; + GeeHashMap* _tmp83_; + PluginsModuleRep* _tmp84_; + const gchar* _tmp85_; + PluginsModuleRep* _tmp86_; + PluginsModuleRep* _tmp87_; + SpitModule* _tmp88_; + gint _tmp89_; + SpitPluggable** _tmp90_; #line 353 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" g_return_if_fail (G_IS_FILE (file)); #line 354 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3979,11 +3984,11 @@ void plugins_load_module (GFile* file) { _tmp2_ = module_rep; #line 355 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp2_ == NULL) { -#line 3982 "Plugins.c" - GFile* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; +#line 3987 "Plugins.c" + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp3_ = file; #line 356 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -4000,7 +4005,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 4003 "Plugins.c" +#line 4008 "Plugins.c" } #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp7_ = module_rep; @@ -4012,10 +4017,10 @@ void plugins_load_module (GFile* file) { entry = _tmp9_; #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (!_tmp10_) { -#line 4015 "Plugins.c" - GFile* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; +#line 4020 "Plugins.c" + GFile* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp11_ = file; #line 364 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -4031,7 +4036,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 4033 "Plugins.c" +#line 4038 "Plugins.c" } #line 370 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp14_ = entry; @@ -4041,11 +4046,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 4043 "Plugins.c" +#line 4048 "Plugins.c" } else { #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp15_ = FALSE; -#line 4047 "Plugins.c" +#line 4052 "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"); @@ -4081,10 +4086,10 @@ 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 4083 "Plugins.c" - GFile* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; +#line 4088 "Plugins.c" + GFile* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp23_ = file; #line 381 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -4102,7 +4107,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 4103 "Plugins.c" +#line 4108 "Plugins.c" } #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp27_ = params; @@ -4112,26 +4117,26 @@ 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 4113 "Plugins.c" +#line 4118 "Plugins.c" } else { - SpitEntryPointParams _tmp29_ = {0}; - gint _tmp30_ = 0; + SpitEntryPointParams _tmp29_; + gint _tmp30_; #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp29_ = params; #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp30_ = _tmp29_.module_spit_interface; #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp26_ = _tmp30_ > PLUGINS_MAX_SPIT_INTERFACE; -#line 4123 "Plugins.c" +#line 4128 "Plugins.c" } #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp26_) { -#line 4127 "Plugins.c" - GFile* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - PluginsModuleRep* _tmp34_ = NULL; - gint _tmp35_ = 0; +#line 4132 "Plugins.c" + GFile* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + PluginsModuleRep* _tmp34_; + gint _tmp35_; #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp31_ = file; #line 388 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -4153,7 +4158,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 4153 "Plugins.c" +#line 4158 "Plugins.c" } #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp36_ = module_rep; @@ -4169,15 +4174,15 @@ 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 4169 "Plugins.c" - PluginsModuleRep* _tmp41_ = NULL; +#line 4174 "Plugins.c" + PluginsModuleRep* _tmp41_; #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp41_ = module_rep; #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_object_unref0 (_tmp41_->spit_module); #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp41_->spit_module = NULL; -#line 4177 "Plugins.c" +#line 4182 "Plugins.c" } #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp42_ = module_rep; @@ -4185,12 +4190,12 @@ void plugins_load_module (GFile* file) { _tmp43_ = _tmp42_->spit_module; #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp43_ == NULL) { -#line 4185 "Plugins.c" - GFile* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - PluginsModuleRep* _tmp47_ = NULL; - gint _tmp48_ = 0; +#line 4190 "Plugins.c" + GFile* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + PluginsModuleRep* _tmp47_; + gint _tmp48_; #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp44_ = file; #line 401 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -4212,7 +4217,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 4211 "Plugins.c" +#line 4216 "Plugins.c" } #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp49_ = module_rep; @@ -4234,12 +4239,12 @@ void plugins_load_module (GFile* file) { _tmp55_ = _tmp54_->id; #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (_tmp55_ == NULL) { -#line 4233 "Plugins.c" - GFile* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - PluginsModuleRep* _tmp59_ = NULL; - gint _tmp60_ = 0; +#line 4238 "Plugins.c" + GFile* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + PluginsModuleRep* _tmp59_; + gint _tmp60_; #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp56_ = file; #line 411 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -4261,7 +4266,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 4259 "Plugins.c" +#line 4264 "Plugins.c" } #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp61_ = plugins_module_table; @@ -4273,14 +4278,14 @@ 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 4271 "Plugins.c" - GFile* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - PluginsModuleRep* _tmp68_ = NULL; - gint _tmp69_ = 0; - PluginsModuleRep* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; +#line 4276 "Plugins.c" + GFile* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + PluginsModuleRep* _tmp68_; + gint _tmp69_; + PluginsModuleRep* _tmp70_; + const gchar* _tmp71_; #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp65_ = file; #line 418 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -4306,7 +4311,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 4303 "Plugins.c" +#line 4308 "Plugins.c" } #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp72_ = module_rep; @@ -4350,7 +4355,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 4347 "Plugins.c" +#line 4352 "Plugins.c" { SpitPluggable** pluggable_collection = NULL; gint pluggable_collection_length1 = 0; @@ -4362,21 +4367,21 @@ 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 4359 "Plugins.c" - SpitPluggable* _tmp91_ = NULL; +#line 4364 "Plugins.c" + SpitPluggable* _tmp91_; 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 4366 "Plugins.c" +#line 4371 "Plugins.c" { - GeeHashMap* _tmp92_ = NULL; - SpitPluggable* _tmp93_ = NULL; - const gchar* _tmp94_ = NULL; - SpitPluggable* _tmp95_ = NULL; - PluginsPluggableRep* _tmp96_ = NULL; - PluginsPluggableRep* _tmp97_ = NULL; + GeeHashMap* _tmp92_; + SpitPluggable* _tmp93_; + const gchar* _tmp94_; + SpitPluggable* _tmp95_; + PluginsPluggableRep* _tmp96_; + PluginsPluggableRep* _tmp97_; #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp92_ = plugins_pluggable_table; #line 432 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -4395,7 +4400,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 4392 "Plugins.c" +#line 4397 "Plugins.c" } } } @@ -4403,7 +4408,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 4400 "Plugins.c" +#line 4405 "Plugins.c" } diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c index bb5d614..745d106 100644 --- a/src/plugins/PublishingInterfaces.c +++ b/src/plugins/PublishingInterfaces.c @@ -1,4 +1,4 @@ -/* PublishingInterfaces.c generated by valac 0.34.7, the Vala compiler +/* PublishingInterfaces.c generated by valac 0.36.6, the Vala compiler * generated from PublishingInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -91,6 +91,12 @@ typedef struct _SpitPublishingPublishableIface SpitPublishingPublishableIface; typedef struct _SpitPublishingAuthenticator SpitPublishingAuthenticator; typedef struct _SpitPublishingAuthenticatorIface SpitPublishingAuthenticatorIface; +enum { + SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATED_SIGNAL, + SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATION_FAILED_SIGNAL, + SPIT_PUBLISHING_AUTHENTICATOR_LAST_SIGNAL +}; +static guint spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_LAST_SIGNAL] = {0}; #define SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY (spit_publishing_authenticator_factory_get_type ()) #define SPIT_PUBLISHING_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory)) @@ -469,7 +475,7 @@ SpitPublishingService* spit_publishing_publisher_get_service (SpitPublishingPubl g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), NULL); #line 121 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->get_service (self); -#line 473 "PublishingInterfaces.c" +#line 479 "PublishingInterfaces.c" } @@ -484,7 +490,7 @@ void spit_publishing_publisher_start (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 129 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->start (self); -#line 488 "PublishingInterfaces.c" +#line 494 "PublishingInterfaces.c" } @@ -496,7 +502,7 @@ gboolean spit_publishing_publisher_is_running (SpitPublishingPublisher* self) { g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), FALSE); #line 134 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->is_running (self); -#line 500 "PublishingInterfaces.c" +#line 506 "PublishingInterfaces.c" } @@ -509,7 +515,7 @@ void spit_publishing_publisher_stop (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 140 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->stop (self); -#line 513 "PublishingInterfaces.c" +#line 519 "PublishingInterfaces.c" } @@ -522,7 +528,7 @@ void spit_publishing_publisher_reserved0 (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 145 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved0 (self); -#line 526 "PublishingInterfaces.c" +#line 532 "PublishingInterfaces.c" } @@ -535,7 +541,7 @@ void spit_publishing_publisher_reserved1 (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 146 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved1 (self); -#line 539 "PublishingInterfaces.c" +#line 545 "PublishingInterfaces.c" } @@ -548,7 +554,7 @@ void spit_publishing_publisher_reserved2 (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 147 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved2 (self); -#line 552 "PublishingInterfaces.c" +#line 558 "PublishingInterfaces.c" } @@ -561,7 +567,7 @@ void spit_publishing_publisher_reserved3 (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 148 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved3 (self); -#line 565 "PublishingInterfaces.c" +#line 571 "PublishingInterfaces.c" } @@ -574,7 +580,7 @@ void spit_publishing_publisher_reserved4 (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 149 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved4 (self); -#line 578 "PublishingInterfaces.c" +#line 584 "PublishingInterfaces.c" } @@ -587,7 +593,7 @@ void spit_publishing_publisher_reserved5 (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 150 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved5 (self); -#line 591 "PublishingInterfaces.c" +#line 597 "PublishingInterfaces.c" } @@ -600,7 +606,7 @@ void spit_publishing_publisher_reserved6 (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 151 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved6 (self); -#line 604 "PublishingInterfaces.c" +#line 610 "PublishingInterfaces.c" } @@ -613,7 +619,7 @@ void spit_publishing_publisher_reserved7 (SpitPublishingPublisher* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self)); #line 152 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved7 (self); -#line 617 "PublishingInterfaces.c" +#line 623 "PublishingInterfaces.c" } @@ -640,7 +646,7 @@ static void spit_publishing_publisher_base_init (SpitPublishingPublisherIface * iface->reserved6 = spit_publishing_publisher_real_reserved6; #line 105 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_publisher_real_reserved7; -#line 644 "PublishingInterfaces.c" +#line 650 "PublishingInterfaces.c" } } @@ -692,7 +698,7 @@ GtkWidget* spit_publishing_dialog_pane_get_widget (SpitPublishingDialogPane* sel g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), NULL); #line 197 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_widget (self); -#line 696 "PublishingInterfaces.c" +#line 702 "PublishingInterfaces.c" } @@ -705,7 +711,7 @@ SpitPublishingDialogPaneGeometryOptions spit_publishing_dialog_pane_get_preferre g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), 0); #line 203 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_preferred_geometry (self); -#line 709 "PublishingInterfaces.c" +#line 715 "PublishingInterfaces.c" } @@ -718,7 +724,7 @@ void spit_publishing_dialog_pane_on_pane_installed (SpitPublishingDialogPane* se g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 209 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_installed (self); -#line 722 "PublishingInterfaces.c" +#line 728 "PublishingInterfaces.c" } @@ -731,7 +737,7 @@ void spit_publishing_dialog_pane_on_pane_uninstalled (SpitPublishingDialogPane* g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 215 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_uninstalled (self); -#line 735 "PublishingInterfaces.c" +#line 741 "PublishingInterfaces.c" } @@ -744,7 +750,7 @@ void spit_publishing_dialog_pane_reserved0 (SpitPublishingDialogPane* self) { g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 220 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved0 (self); -#line 748 "PublishingInterfaces.c" +#line 754 "PublishingInterfaces.c" } @@ -757,7 +763,7 @@ void spit_publishing_dialog_pane_reserved1 (SpitPublishingDialogPane* self) { g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 221 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved1 (self); -#line 761 "PublishingInterfaces.c" +#line 767 "PublishingInterfaces.c" } @@ -770,7 +776,7 @@ void spit_publishing_dialog_pane_reserved2 (SpitPublishingDialogPane* self) { g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 222 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved2 (self); -#line 774 "PublishingInterfaces.c" +#line 780 "PublishingInterfaces.c" } @@ -783,7 +789,7 @@ void spit_publishing_dialog_pane_reserved3 (SpitPublishingDialogPane* self) { g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 223 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved3 (self); -#line 787 "PublishingInterfaces.c" +#line 793 "PublishingInterfaces.c" } @@ -796,7 +802,7 @@ void spit_publishing_dialog_pane_reserved4 (SpitPublishingDialogPane* self) { g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 224 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved4 (self); -#line 800 "PublishingInterfaces.c" +#line 806 "PublishingInterfaces.c" } @@ -809,7 +815,7 @@ void spit_publishing_dialog_pane_reserved5 (SpitPublishingDialogPane* self) { g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 225 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved5 (self); -#line 813 "PublishingInterfaces.c" +#line 819 "PublishingInterfaces.c" } @@ -822,7 +828,7 @@ void spit_publishing_dialog_pane_reserved6 (SpitPublishingDialogPane* self) { g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 226 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved6 (self); -#line 826 "PublishingInterfaces.c" +#line 832 "PublishingInterfaces.c" } @@ -835,7 +841,7 @@ void spit_publishing_dialog_pane_reserved7 (SpitPublishingDialogPane* self) { g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self)); #line 227 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved7 (self); -#line 839 "PublishingInterfaces.c" +#line 845 "PublishingInterfaces.c" } @@ -862,7 +868,7 @@ static void spit_publishing_dialog_pane_base_init (SpitPublishingDialogPaneIface iface->reserved6 = spit_publishing_dialog_pane_real_reserved6; #line 160 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_dialog_pane_real_reserved7; -#line 866 "PublishingInterfaces.c" +#line 872 "PublishingInterfaces.c" } } @@ -912,7 +918,7 @@ void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, GEr g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 277 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->post_error (self, err); -#line 916 "PublishingInterfaces.c" +#line 922 "PublishingInterfaces.c" } @@ -927,7 +933,7 @@ void spit_publishing_plugin_host_stop_publishing (SpitPublishingPluginHost* self g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 285 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->stop_publishing (self); -#line 931 "PublishingInterfaces.c" +#line 937 "PublishingInterfaces.c" } @@ -939,7 +945,7 @@ SpitPublishingPublisher* spit_publishing_plugin_host_get_publisher (SpitPublishi g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL); #line 290 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publisher (self); -#line 943 "PublishingInterfaces.c" +#line 949 "PublishingInterfaces.c" } @@ -966,7 +972,7 @@ void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost* g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 310 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_dialog_pane (self, pane, mode); -#line 970 "PublishingInterfaces.c" +#line 976 "PublishingInterfaces.c" } @@ -1001,7 +1007,7 @@ void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPlug g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 339 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_static_message_pane (self, message, mode); -#line 1005 "PublishingInterfaces.c" +#line 1011 "PublishingInterfaces.c" } @@ -1028,7 +1034,7 @@ void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPlugi g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 360 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_pango_message_pane (self, markup, mode); -#line 1032 "PublishingInterfaces.c" +#line 1038 "PublishingInterfaces.c" } @@ -1049,7 +1055,7 @@ void spit_publishing_plugin_host_install_success_pane (SpitPublishingPluginHost* g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 375 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_success_pane (self); -#line 1053 "PublishingInterfaces.c" +#line 1059 "PublishingInterfaces.c" } @@ -1072,7 +1078,7 @@ void spit_publishing_plugin_host_install_account_fetch_wait_pane (SpitPublishing g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 391 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_account_fetch_wait_pane (self); -#line 1076 "PublishingInterfaces.c" +#line 1082 "PublishingInterfaces.c" } @@ -1092,7 +1098,7 @@ void spit_publishing_plugin_host_install_login_wait_pane (SpitPublishingPluginHo g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 405 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_login_wait_pane (self); -#line 1096 "PublishingInterfaces.c" +#line 1102 "PublishingInterfaces.c" } @@ -1121,7 +1127,7 @@ void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost* g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 427 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_welcome_pane (self, welcome_message, on_login_clicked, on_login_clicked_target); -#line 1125 "PublishingInterfaces.c" +#line 1131 "PublishingInterfaces.c" } @@ -1144,7 +1150,7 @@ void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* s g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 444 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_service_locked (self, is_locked); -#line 1148 "PublishingInterfaces.c" +#line 1154 "PublishingInterfaces.c" } @@ -1163,7 +1169,7 @@ void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPlugin g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 456 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_dialog_default_widget (self, widget); -#line 1167 "PublishingInterfaces.c" +#line 1173 "PublishingInterfaces.c" } @@ -1176,7 +1182,7 @@ SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPu g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL); #line 462 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishables (self, result_length1); -#line 1180 "PublishingInterfaces.c" +#line 1186 "PublishingInterfaces.c" } @@ -1215,7 +1221,7 @@ SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishable g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL); #line 494 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->serialize_publishables (self, content_major_axis, strip_metadata, result_target, result_target_destroy_notify); -#line 1219 "PublishingInterfaces.c" +#line 1225 "PublishingInterfaces.c" } @@ -1229,7 +1235,7 @@ SpitPublishingPublisherMediaType spit_publishing_plugin_host_get_publishable_med g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), 0); #line 502 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishable_media_type (self); -#line 1233 "PublishingInterfaces.c" +#line 1239 "PublishingInterfaces.c" } @@ -1242,7 +1248,7 @@ void spit_publishing_plugin_host_reserved0 (SpitPublishingPluginHost* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 507 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved0 (self); -#line 1246 "PublishingInterfaces.c" +#line 1252 "PublishingInterfaces.c" } @@ -1255,7 +1261,7 @@ void spit_publishing_plugin_host_reserved1 (SpitPublishingPluginHost* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 508 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved1 (self); -#line 1259 "PublishingInterfaces.c" +#line 1265 "PublishingInterfaces.c" } @@ -1268,7 +1274,7 @@ void spit_publishing_plugin_host_reserved2 (SpitPublishingPluginHost* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 509 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved2 (self); -#line 1272 "PublishingInterfaces.c" +#line 1278 "PublishingInterfaces.c" } @@ -1281,7 +1287,7 @@ void spit_publishing_plugin_host_reserved3 (SpitPublishingPluginHost* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 510 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved3 (self); -#line 1285 "PublishingInterfaces.c" +#line 1291 "PublishingInterfaces.c" } @@ -1294,7 +1300,7 @@ void spit_publishing_plugin_host_reserved4 (SpitPublishingPluginHost* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 511 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved4 (self); -#line 1298 "PublishingInterfaces.c" +#line 1304 "PublishingInterfaces.c" } @@ -1307,7 +1313,7 @@ void spit_publishing_plugin_host_reserved5 (SpitPublishingPluginHost* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 512 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved5 (self); -#line 1311 "PublishingInterfaces.c" +#line 1317 "PublishingInterfaces.c" } @@ -1320,7 +1326,7 @@ void spit_publishing_plugin_host_reserved6 (SpitPublishingPluginHost* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 513 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved6 (self); -#line 1324 "PublishingInterfaces.c" +#line 1330 "PublishingInterfaces.c" } @@ -1333,7 +1339,7 @@ void spit_publishing_plugin_host_reserved7 (SpitPublishingPluginHost* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self)); #line 514 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved7 (self); -#line 1337 "PublishingInterfaces.c" +#line 1343 "PublishingInterfaces.c" } @@ -1360,7 +1366,7 @@ static void spit_publishing_plugin_host_base_init (SpitPublishingPluginHostIface iface->reserved6 = spit_publishing_plugin_host_real_reserved6; #line 260 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_plugin_host_real_reserved7; -#line 1364 "PublishingInterfaces.c" +#line 1370 "PublishingInterfaces.c" } } @@ -1403,7 +1409,7 @@ GFile* spit_publishing_publishable_get_serialized_file (SpitPublishingPublishabl g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 535 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_serialized_file (self); -#line 1407 "PublishingInterfaces.c" +#line 1413 "PublishingInterfaces.c" } @@ -1419,7 +1425,7 @@ gchar* spit_publishing_publishable_get_publishing_name (SpitPublishingPublishabl g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 544 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_name (self); -#line 1423 "PublishingInterfaces.c" +#line 1429 "PublishingInterfaces.c" } @@ -1432,7 +1438,7 @@ gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable* g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 550 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_param_string (self, name); -#line 1436 "PublishingInterfaces.c" +#line 1442 "PublishingInterfaces.c" } @@ -1445,7 +1451,7 @@ gchar** spit_publishing_publishable_get_publishing_keywords (SpitPublishingPubli g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 556 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_keywords (self, result_length1); -#line 1449 "PublishingInterfaces.c" +#line 1455 "PublishingInterfaces.c" } @@ -1457,7 +1463,7 @@ SpitPublishingPublisherMediaType spit_publishing_publishable_get_media_type (Spi g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), 0); #line 561 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_media_type (self); -#line 1461 "PublishingInterfaces.c" +#line 1467 "PublishingInterfaces.c" } @@ -1469,7 +1475,7 @@ GDateTime* spit_publishing_publishable_get_exposure_date_time (SpitPublishingPub g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL); #line 566 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_exposure_date_time (self); -#line 1473 "PublishingInterfaces.c" +#line 1479 "PublishingInterfaces.c" } @@ -1482,7 +1488,7 @@ void spit_publishing_publishable_reserved0 (SpitPublishingPublishable* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 571 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved0 (self); -#line 1486 "PublishingInterfaces.c" +#line 1492 "PublishingInterfaces.c" } @@ -1495,7 +1501,7 @@ void spit_publishing_publishable_reserved1 (SpitPublishingPublishable* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 572 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved1 (self); -#line 1499 "PublishingInterfaces.c" +#line 1505 "PublishingInterfaces.c" } @@ -1508,7 +1514,7 @@ void spit_publishing_publishable_reserved2 (SpitPublishingPublishable* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 573 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved2 (self); -#line 1512 "PublishingInterfaces.c" +#line 1518 "PublishingInterfaces.c" } @@ -1521,7 +1527,7 @@ void spit_publishing_publishable_reserved3 (SpitPublishingPublishable* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 574 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved3 (self); -#line 1525 "PublishingInterfaces.c" +#line 1531 "PublishingInterfaces.c" } @@ -1534,7 +1540,7 @@ void spit_publishing_publishable_reserved4 (SpitPublishingPublishable* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 575 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved4 (self); -#line 1538 "PublishingInterfaces.c" +#line 1544 "PublishingInterfaces.c" } @@ -1547,7 +1553,7 @@ void spit_publishing_publishable_reserved5 (SpitPublishingPublishable* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 576 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved5 (self); -#line 1551 "PublishingInterfaces.c" +#line 1557 "PublishingInterfaces.c" } @@ -1560,7 +1566,7 @@ void spit_publishing_publishable_reserved6 (SpitPublishingPublishable* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 577 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved6 (self); -#line 1564 "PublishingInterfaces.c" +#line 1570 "PublishingInterfaces.c" } @@ -1573,7 +1579,7 @@ void spit_publishing_publishable_reserved7 (SpitPublishingPublishable* self) { g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self)); #line 578 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved7 (self); -#line 1577 "PublishingInterfaces.c" +#line 1583 "PublishingInterfaces.c" } @@ -1600,7 +1606,7 @@ static void spit_publishing_publishable_base_init (SpitPublishingPublishableIfac iface->reserved6 = spit_publishing_publishable_real_reserved6; #line 521 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_publishable_real_reserved7; -#line 1604 "PublishingInterfaces.c" +#line 1610 "PublishingInterfaces.c" } } @@ -1631,7 +1637,7 @@ SpitPublishingPublisher* spit_publishing_service_create_publisher (SpitPublishin g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), NULL); #line 591 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->create_publisher (self, host); -#line 1635 "PublishingInterfaces.c" +#line 1641 "PublishingInterfaces.c" } @@ -1643,7 +1649,7 @@ SpitPublishingPublisherMediaType spit_publishing_service_get_supported_media (Sp g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), 0); #line 596 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->get_supported_media (self); -#line 1647 "PublishingInterfaces.c" +#line 1653 "PublishingInterfaces.c" } @@ -1656,7 +1662,7 @@ void spit_publishing_service_reserved0 (SpitPublishingService* self) { g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 601 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved0 (self); -#line 1660 "PublishingInterfaces.c" +#line 1666 "PublishingInterfaces.c" } @@ -1669,7 +1675,7 @@ void spit_publishing_service_reserved1 (SpitPublishingService* self) { g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 602 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved1 (self); -#line 1673 "PublishingInterfaces.c" +#line 1679 "PublishingInterfaces.c" } @@ -1682,7 +1688,7 @@ void spit_publishing_service_reserved2 (SpitPublishingService* self) { g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 603 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved2 (self); -#line 1686 "PublishingInterfaces.c" +#line 1692 "PublishingInterfaces.c" } @@ -1695,7 +1701,7 @@ void spit_publishing_service_reserved3 (SpitPublishingService* self) { g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 604 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved3 (self); -#line 1699 "PublishingInterfaces.c" +#line 1705 "PublishingInterfaces.c" } @@ -1708,7 +1714,7 @@ void spit_publishing_service_reserved4 (SpitPublishingService* self) { g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 605 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved4 (self); -#line 1712 "PublishingInterfaces.c" +#line 1718 "PublishingInterfaces.c" } @@ -1721,7 +1727,7 @@ void spit_publishing_service_reserved5 (SpitPublishingService* self) { g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 606 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved5 (self); -#line 1725 "PublishingInterfaces.c" +#line 1731 "PublishingInterfaces.c" } @@ -1734,7 +1740,7 @@ void spit_publishing_service_reserved6 (SpitPublishingService* self) { g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 607 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved6 (self); -#line 1738 "PublishingInterfaces.c" +#line 1744 "PublishingInterfaces.c" } @@ -1747,7 +1753,7 @@ void spit_publishing_service_reserved7 (SpitPublishingService* self) { g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self)); #line 608 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved7 (self); -#line 1751 "PublishingInterfaces.c" +#line 1757 "PublishingInterfaces.c" } @@ -1774,7 +1780,7 @@ static void spit_publishing_service_base_init (SpitPublishingServiceIface * ifac iface->reserved6 = spit_publishing_service_real_reserved6; #line 586 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" iface->reserved7 = spit_publishing_service_real_reserved7; -#line 1778 "PublishingInterfaces.c" +#line 1784 "PublishingInterfaces.c" } } @@ -1803,7 +1809,7 @@ void spit_publishing_authenticator_authenticate (SpitPublishingAuthenticator* se g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self)); #line 615 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->authenticate (self); -#line 1807 "PublishingInterfaces.c" +#line 1813 "PublishingInterfaces.c" } @@ -1812,7 +1818,7 @@ gboolean spit_publishing_authenticator_can_logout (SpitPublishingAuthenticator* g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), FALSE); #line 616 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->can_logout (self); -#line 1816 "PublishingInterfaces.c" +#line 1822 "PublishingInterfaces.c" } @@ -1821,7 +1827,7 @@ void spit_publishing_authenticator_logout (SpitPublishingAuthenticator* self) { g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self)); #line 617 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->logout (self); -#line 1825 "PublishingInterfaces.c" +#line 1831 "PublishingInterfaces.c" } @@ -1830,7 +1836,7 @@ void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self) { g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self)); #line 618 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->refresh (self); -#line 1834 "PublishingInterfaces.c" +#line 1840 "PublishingInterfaces.c" } @@ -1839,7 +1845,7 @@ GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPubl g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), NULL); #line 620 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->get_authentication_parameter (self); -#line 1843 "PublishingInterfaces.c" +#line 1849 "PublishingInterfaces.c" } @@ -1851,10 +1857,10 @@ static void spit_publishing_authenticator_base_init (SpitPublishingAuthenticator #line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" initialized = TRUE; #line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" - g_signal_new ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATED_SIGNAL] = g_signal_new ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" - g_signal_new ("authentication_failed", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1858 "PublishingInterfaces.c" + spit_publishing_authenticator_signals[SPIT_PUBLISHING_AUTHENTICATOR_AUTHENTICATION_FAILED_SIGNAL] = g_signal_new ("authentication-failed", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 1864 "PublishingInterfaces.c" } } @@ -1877,7 +1883,7 @@ GeeList* spit_publishing_authenticator_factory_get_available_authenticators (Spi g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL); #line 628 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->get_available_authenticators (self); -#line 1881 "PublishingInterfaces.c" +#line 1887 "PublishingInterfaces.c" } @@ -1886,7 +1892,7 @@ SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitP g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL); #line 629 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->create (self, provider, host); -#line 1890 "PublishingInterfaces.c" +#line 1896 "PublishingInterfaces.c" } @@ -1897,7 +1903,7 @@ static void spit_publishing_authenticator_factory_base_init (SpitPublishingAuthe if (!initialized) { #line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala" initialized = TRUE; -#line 1901 "PublishingInterfaces.c" +#line 1907 "PublishingInterfaces.c" } } diff --git a/src/plugins/SpitInterfaces.c b/src/plugins/SpitInterfaces.c index 7c1d3cc..83c548d 100644 --- a/src/plugins/SpitInterfaces.c +++ b/src/plugins/SpitInterfaces.c @@ -1,4 +1,4 @@ -/* SpitInterfaces.c generated by valac 0.34.7, the Vala compiler +/* SpitInterfaces.c generated by valac 0.36.6, the Vala compiler * generated from SpitInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -233,8 +233,8 @@ gint spit_negotiate_interfaces (gint min_host_interface, gint max_host_interface gint result = 0; gint _tmp0_ = 0; gboolean _tmp1_ = FALSE; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + gint _tmp2_; + gint _tmp3_; #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _tmp2_ = min_host_interface; #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" @@ -245,8 +245,8 @@ gint spit_negotiate_interfaces (gint min_host_interface, gint max_host_interface _tmp1_ = TRUE; #line 247 "SpitInterfaces.c" } else { - gint _tmp4_ = 0; - gint _tmp5_ = 0; + gint _tmp4_; + gint _tmp5_; #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _tmp4_ = max_host_interface; #line 47 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" @@ -261,7 +261,7 @@ gint spit_negotiate_interfaces (gint min_host_interface, gint max_host_interface _tmp0_ = SPIT_UNSUPPORTED_INTERFACE; #line 263 "SpitInterfaces.c" } else { - gint _tmp6_ = 0; + gint _tmp6_; #line 48 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _tmp6_ = plugin_interface; #line 48 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" @@ -284,11 +284,11 @@ static gpointer _g_object_ref0 (gpointer self) { void spit_entry_point_params_copy (const SpitEntryPointParams* self, SpitEntryPointParams* dest) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _tmp0_ = (*self).host_min_spit_interface; #line 62 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" @@ -576,7 +576,7 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" for (i = 0; i < length; i++) { #line 579 "SpitInterfaces.c" - GdkPixbuf* _tmp0_ = NULL; + GdkPixbuf* _tmp0_; #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" @@ -590,27 +590,27 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* dest) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - GdkPixbuf** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - GdkPixbuf** _tmp18_ = NULL; - gint _tmp18__length1 = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + gboolean _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + GdkPixbuf** _tmp17_; + gint _tmp17__length1; + GdkPixbuf** _tmp18_; + gint _tmp18__length1; #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" _tmp0_ = (*self).version; #line 162 "/home/jens/Source/shotwell/src/plugins/SpitInterfaces.vala" diff --git a/src/plugins/StandardHostInterface.c b/src/plugins/StandardHostInterface.c index 1694df3..c1b8599 100644 --- a/src/plugins/StandardHostInterface.c +++ b/src/plugins/StandardHostInterface.c @@ -1,4 +1,4 @@ -/* StandardHostInterface.c generated by valac 0.34.7, the Vala compiler +/* StandardHostInterface.c generated by valac 0.36.6, the Vala compiler * generated from StandardHostInterface.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -68,7 +68,7 @@ struct _PluginsStandardHostInterfacePrivate { static gpointer plugins_standard_host_interface_parent_class = NULL; -static SpitHostInterfaceIface* plugins_standard_host_interface_spit_host_interface_parent_iface = NULL; +static SpitHostInterfaceIface * plugins_standard_host_interface_spit_host_interface_parent_iface = NULL; GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST; #define PLUGINS_STANDARD_HOST_INTERFACE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterfacePrivate)) @@ -101,19 +101,19 @@ static void plugins_standard_host_interface_real_set_config_double (SpitHostInte void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val); static void plugins_standard_host_interface_real_unset_config_key (SpitHostInterface* base, const gchar* key); void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key); -static void plugins_standard_host_interface_finalize (GObject* obj); +static void plugins_standard_host_interface_finalize (GObject * obj); PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain) { PluginsStandardHostInterface * self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - SpitPluggable* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - SpitPluggable* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - SpitPluggable* _tmp7_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + SpitPluggable* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + SpitPluggable* _tmp5_; + GFile* _tmp6_; + SpitPluggable* _tmp7_; #line 15 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" g_return_val_if_fail (SPIT_IS_PLUGGABLE (pluggable), NULL); #line 15 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -165,8 +165,8 @@ PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable static gchar* plugins_standard_host_interface_parse_key (const gchar* id) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; GQuark _tmp3_ = 0U; #line 25 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" static GQuark _tmp2_label0 = 0; @@ -191,7 +191,7 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) { #line 192 "StandardHostInterface.c" default: { - gchar* _tmp4_ = NULL; + gchar* _tmp4_; #line 27 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp4_ = g_strdup ("facebook"); #line 27 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -207,7 +207,7 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) { #line 208 "StandardHostInterface.c" default: { - gchar* _tmp5_ = NULL; + gchar* _tmp5_; #line 30 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp5_ = g_strdup ("picasa"); #line 30 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -223,7 +223,7 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) { #line 224 "StandardHostInterface.c" default: { - gchar* _tmp6_ = NULL; + gchar* _tmp6_; #line 33 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp6_ = g_strdup ("flickr"); #line 33 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -239,7 +239,7 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) { #line 240 "StandardHostInterface.c" default: { - gchar* _tmp7_ = NULL; + gchar* _tmp7_; #line 36 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp7_ = g_strdup ("youtube"); #line 36 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -255,8 +255,8 @@ static gchar* plugins_standard_host_interface_parse_key (const gchar* id) { #line 256 "StandardHostInterface.c" default: { - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + const gchar* _tmp8_; + gchar* _tmp9_; #line 39 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" _tmp8_ = id; #line 39 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -282,8 +282,8 @@ static gpointer _g_object_ref0 (gpointer self) { static GFile* plugins_standard_host_interface_real_get_module_file (SpitHostInterface* base) { PluginsStandardHostInterface * self; GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 43 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 44 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -301,14 +301,14 @@ static GFile* plugins_standard_host_interface_real_get_module_file (SpitHostInte static gboolean plugins_standard_host_interface_real_get_config_bool (SpitHostInterface* base, const gchar* key, gboolean def) { PluginsStandardHostInterface * self; gboolean result = FALSE; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; #line 47 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 47 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -341,12 +341,12 @@ static gboolean plugins_standard_host_interface_real_get_config_bool (SpitHostIn static void plugins_standard_host_interface_real_set_config_bool (SpitHostInterface* base, const gchar* key, gboolean val) { PluginsStandardHostInterface * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gboolean _tmp5_; #line 51 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 51 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -374,14 +374,14 @@ static void plugins_standard_host_interface_real_set_config_bool (SpitHostInterf static gint plugins_standard_host_interface_real_get_config_int (SpitHostInterface* base, const gchar* key, gint def) { PluginsStandardHostInterface * self; gint result = 0; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 55 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 55 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -414,12 +414,12 @@ static gint plugins_standard_host_interface_real_get_config_int (SpitHostInterfa static void plugins_standard_host_interface_real_set_config_int (SpitHostInterface* base, const gchar* key, gint val) { PluginsStandardHostInterface * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gint _tmp5_; #line 59 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 59 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -447,14 +447,14 @@ static void plugins_standard_host_interface_real_set_config_int (SpitHostInterfa static gchar* plugins_standard_host_interface_real_get_config_string (SpitHostInterface* base, const gchar* key, const gchar* def) { PluginsStandardHostInterface * self; gchar* result = NULL; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 63 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 63 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -487,12 +487,12 @@ static gchar* plugins_standard_host_interface_real_get_config_string (SpitHostIn static void plugins_standard_host_interface_real_set_config_string (SpitHostInterface* base, const gchar* key, const gchar* val) { PluginsStandardHostInterface * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; #line 67 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 67 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -520,14 +520,14 @@ static void plugins_standard_host_interface_real_set_config_string (SpitHostInte static gdouble plugins_standard_host_interface_real_get_config_double (SpitHostInterface* base, const gchar* key, gdouble def) { PluginsStandardHostInterface * self; gdouble result = 0.0; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gdouble _tmp5_ = 0.0; - gdouble _tmp6_ = 0.0; - gdouble _tmp7_ = 0.0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gdouble _tmp5_; + gdouble _tmp6_; + gdouble _tmp7_; #line 71 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 71 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -560,12 +560,12 @@ static gdouble plugins_standard_host_interface_real_get_config_double (SpitHostI static void plugins_standard_host_interface_real_set_config_double (SpitHostInterface* base, const gchar* key, gdouble val) { PluginsStandardHostInterface * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gdouble _tmp5_ = 0.0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gdouble _tmp5_; #line 75 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 75 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -592,11 +592,11 @@ static void plugins_standard_host_interface_real_set_config_double (SpitHostInte static void plugins_standard_host_interface_real_unset_config_key (SpitHostInterface* base, const gchar* key) { PluginsStandardHostInterface * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; #line 79 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); #line 79 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" @@ -634,25 +634,25 @@ static void plugins_standard_host_interface_spit_host_interface_interface_init ( #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" plugins_standard_host_interface_spit_host_interface_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->get_module_file = (GFile* (*)(SpitHostInterface*)) plugins_standard_host_interface_real_get_module_file; + iface->get_module_file = (GFile* (*) (SpitHostInterface *)) plugins_standard_host_interface_real_get_module_file; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->get_config_bool = (gboolean (*)(SpitHostInterface*, const gchar*, gboolean)) plugins_standard_host_interface_real_get_config_bool; + iface->get_config_bool = (gboolean (*) (SpitHostInterface *, const gchar*, gboolean)) plugins_standard_host_interface_real_get_config_bool; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->set_config_bool = (void (*)(SpitHostInterface*, const gchar*, gboolean)) plugins_standard_host_interface_real_set_config_bool; + iface->set_config_bool = (void (*) (SpitHostInterface *, const gchar*, gboolean)) plugins_standard_host_interface_real_set_config_bool; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->get_config_int = (gint (*)(SpitHostInterface*, const gchar*, gint)) plugins_standard_host_interface_real_get_config_int; + iface->get_config_int = (gint (*) (SpitHostInterface *, const gchar*, gint)) plugins_standard_host_interface_real_get_config_int; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->set_config_int = (void (*)(SpitHostInterface*, const gchar*, gint)) plugins_standard_host_interface_real_set_config_int; + iface->set_config_int = (void (*) (SpitHostInterface *, const gchar*, gint)) plugins_standard_host_interface_real_set_config_int; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->get_config_string = (gchar* (*)(SpitHostInterface*, const gchar*, const gchar*)) plugins_standard_host_interface_real_get_config_string; + iface->get_config_string = (gchar* (*) (SpitHostInterface *, const gchar*, const gchar*)) plugins_standard_host_interface_real_get_config_string; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->set_config_string = (void (*)(SpitHostInterface*, const gchar*, const gchar*)) plugins_standard_host_interface_real_set_config_string; + iface->set_config_string = (void (*) (SpitHostInterface *, const gchar*, const gchar*)) plugins_standard_host_interface_real_set_config_string; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->get_config_double = (gdouble (*)(SpitHostInterface*, const gchar*, gdouble)) plugins_standard_host_interface_real_get_config_double; + iface->get_config_double = (gdouble (*) (SpitHostInterface *, const gchar*, gdouble)) plugins_standard_host_interface_real_get_config_double; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->set_config_double = (void (*)(SpitHostInterface*, const gchar*, gdouble)) plugins_standard_host_interface_real_set_config_double; + iface->set_config_double = (void (*) (SpitHostInterface *, const gchar*, gdouble)) plugins_standard_host_interface_real_set_config_double; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" - iface->unset_config_key = (void (*)(SpitHostInterface*, const gchar*)) plugins_standard_host_interface_real_unset_config_key; + iface->unset_config_key = (void (*) (SpitHostInterface *, const gchar*)) plugins_standard_host_interface_real_unset_config_key; #line 657 "StandardHostInterface.c" } @@ -664,7 +664,7 @@ static void plugins_standard_host_interface_instance_init (PluginsStandardHostIn } -static void plugins_standard_host_interface_finalize (GObject* obj) { +static void plugins_standard_host_interface_finalize (GObject * obj) { PluginsStandardHostInterface * self; #line 9 "/home/jens/Source/shotwell/src/plugins/StandardHostInterface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_STANDARD_HOST_INTERFACE, PluginsStandardHostInterface); diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c index 110b59a..0e06742 100644 --- a/src/plugins/TransitionsInterfaces.c +++ b/src/plugins/TransitionsInterfaces.c @@ -1,4 +1,4 @@ -/* TransitionsInterfaces.c generated by valac 0.34.7, the Vala compiler +/* TransitionsInterfaces.c generated by valac 0.36.6, the Vala compiler * generated from TransitionsInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -228,19 +228,19 @@ GType spit_transitions_visuals_get_type (void) G_GNUC_CONST; #define SPIT_TRANSITIONS_VISUALS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisualsPrivate)) enum { SPIT_TRANSITIONS_VISUALS_DUMMY_PROPERTY, - SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, - SPIT_TRANSITIONS_VISUALS_FROM_POS, - SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, - SPIT_TRANSITIONS_VISUALS_TO_POS, - SPIT_TRANSITIONS_VISUALS_BG_COLOR + SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY, + SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY, + SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY, + SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY, + SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY }; SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color); SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color); static void spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value); -static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle* value); +static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle * value); static void spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value); -static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle* value); -static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA* value); +static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle * value); +static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA * value); void spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self); static void spit_transitions_visuals_real_reserved0 (SpitTransitionsVisuals* self); void spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self); @@ -258,22 +258,24 @@ static void spit_transitions_visuals_real_reserved6 (SpitTransitionsVisuals* sel void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self); static void spit_transitions_visuals_real_reserved7 (SpitTransitionsVisuals* self); GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self); -void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle* result); +void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result); +static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, const cairo_rectangle_int_t * s2); GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self); -void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle* result); -void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA* result); -static void spit_transitions_visuals_finalize (GObject* obj); +void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result); +void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result); +static gboolean _gdk_rgba_equal (const GdkRGBA * s1, const GdkRGBA * s2); +static void spit_transitions_visuals_finalize (GObject * obj); static void _vala_spit_transitions_visuals_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_spit_transitions_visuals_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); GType spit_transitions_motion_get_type (void) G_GNUC_CONST; #define SPIT_TRANSITIONS_MOTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotionPrivate)) enum { SPIT_TRANSITIONS_MOTION_DUMMY_PROPERTY, - SPIT_TRANSITIONS_MOTION_DIRECTION, - SPIT_TRANSITIONS_MOTION_FPS, - SPIT_TRANSITIONS_MOTION_DURATION_MSEC, - SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES, - SPIT_TRANSITIONS_MOTION_TICK_MSEC + SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY, + SPIT_TRANSITIONS_MOTION_FPS_PROPERTY, + SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY, + SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY, + SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY }; SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec); SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec); @@ -302,7 +304,7 @@ SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsM gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self); gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self); gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self); -static void spit_transitions_motion_finalize (GObject* obj); +static void spit_transitions_motion_finalize (GObject * obj); static void _vala_spit_transitions_motion_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_spit_transitions_motion_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); GType spit_pluggable_info_get_type (void) G_GNUC_CONST; @@ -379,11 +381,11 @@ GType spit_transitions_direction_get_type (void) { SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color) { SpitTransitionsVisuals * self = NULL; - GdkPixbuf* _tmp0_ = NULL; - GdkRectangle _tmp1_ = {0}; - GdkPixbuf* _tmp2_ = NULL; - GdkRectangle _tmp3_ = {0}; - GdkRGBA _tmp4_ = {0}; + GdkPixbuf* _tmp0_; + GdkRectangle _tmp1_; + GdkPixbuf* _tmp2_; + GdkRectangle _tmp3_; + GdkRGBA _tmp4_; #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail ((from_pixbuf == NULL) || GDK_IS_PIXBUF (from_pixbuf), NULL); #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -418,14 +420,14 @@ SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, G spit_transitions_visuals_set_bg_color (self, &_tmp4_); #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return self; -#line 422 "TransitionsInterfaces.c" +#line 424 "TransitionsInterfaces.c" } SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color) { #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return spit_transitions_visuals_construct (SPIT_TRANSITIONS_TYPE_VISUALS, from_pixbuf, from_pos, to_pixbuf, to_pos, bg_color); -#line 429 "TransitionsInterfaces.c" +#line 431 "TransitionsInterfaces.c" } @@ -438,7 +440,7 @@ void spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 106 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved0 (self); -#line 442 "TransitionsInterfaces.c" +#line 444 "TransitionsInterfaces.c" } @@ -451,7 +453,7 @@ void spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 107 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved1 (self); -#line 455 "TransitionsInterfaces.c" +#line 457 "TransitionsInterfaces.c" } @@ -464,7 +466,7 @@ void spit_transitions_visuals_reserved2 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 108 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved2 (self); -#line 468 "TransitionsInterfaces.c" +#line 470 "TransitionsInterfaces.c" } @@ -477,7 +479,7 @@ void spit_transitions_visuals_reserved3 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 109 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved3 (self); -#line 481 "TransitionsInterfaces.c" +#line 483 "TransitionsInterfaces.c" } @@ -490,7 +492,7 @@ void spit_transitions_visuals_reserved4 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 110 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved4 (self); -#line 494 "TransitionsInterfaces.c" +#line 496 "TransitionsInterfaces.c" } @@ -503,7 +505,7 @@ void spit_transitions_visuals_reserved5 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 111 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved5 (self); -#line 507 "TransitionsInterfaces.c" +#line 509 "TransitionsInterfaces.c" } @@ -516,7 +518,7 @@ void spit_transitions_visuals_reserved6 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 112 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved6 (self); -#line 520 "TransitionsInterfaces.c" +#line 522 "TransitionsInterfaces.c" } @@ -529,13 +531,13 @@ void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 113 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved7 (self); -#line 533 "TransitionsInterfaces.c" +#line 535 "TransitionsInterfaces.c" } GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self) { GdkPixbuf* result; - GdkPixbuf* _tmp0_ = NULL; + GdkPixbuf* _tmp0_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self), NULL); #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -544,38 +546,42 @@ GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* sel result = _tmp0_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 548 "TransitionsInterfaces.c" +#line 550 "TransitionsInterfaces.c" } static gpointer _g_object_ref0 (gpointer self) { #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return self ? g_object_ref (self) : NULL; -#line 555 "TransitionsInterfaces.c" +#line 557 "TransitionsInterfaces.c" } static void spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value) { - GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_visuals_get_from_pixbuf (self) != value) { +#line 566 "TransitionsInterfaces.c" + GdkPixbuf* _tmp0_; + GdkPixbuf* _tmp1_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _g_object_unref0 (self->priv->_from_pixbuf); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + _g_object_unref0 (self->priv->_from_pixbuf); #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_from_pixbuf = _tmp1_; + self->priv->_from_pixbuf = _tmp1_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "from-pixbuf"); -#line 574 "TransitionsInterfaces.c" + g_object_notify ((GObject *) self, "from-pixbuf"); +#line 579 "TransitionsInterfaces.c" + } } -void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle* result) { - GdkRectangle _tmp0_ = {0}; +void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result) { + GdkRectangle _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -584,27 +590,81 @@ void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRec *result = _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return; -#line 588 "TransitionsInterfaces.c" +#line 594 "TransitionsInterfaces.c" +} + + +static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, const cairo_rectangle_int_t * s2) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1 == s2) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return TRUE; +#line 603 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1 == NULL) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 609 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s2 == NULL) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 615 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->x != s2->x) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 621 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->y != s2->y) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 627 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->width != s2->width) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 633 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->height != s2->height) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 639 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return TRUE; +#line 643 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle* value) { - GdkRectangle _tmp0_ = {0}; +static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle * value) { + GdkRectangle old_value; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = *value; + if (_cairo_rectangle_int_equal (value, (spit_transitions_visuals_get_from_pos (self, &old_value), &old_value)) != TRUE) { +#line 653 "TransitionsInterfaces.c" + GdkRectangle _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_from_pos = _tmp0_; + _tmp0_ = *value; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "from-pos"); -#line 602 "TransitionsInterfaces.c" + self->priv->_from_pos = _tmp0_; +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "from-pos"); +#line 661 "TransitionsInterfaces.c" + } } GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self) { GdkPixbuf* result; - GdkPixbuf* _tmp0_ = NULL; + GdkPixbuf* _tmp0_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self), NULL); #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -613,31 +673,35 @@ GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self) result = _tmp0_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 617 "TransitionsInterfaces.c" +#line 677 "TransitionsInterfaces.c" } static void spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value) { - GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_visuals_get_to_pixbuf (self) != value) { +#line 686 "TransitionsInterfaces.c" + GdkPixbuf* _tmp0_; + GdkPixbuf* _tmp1_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _g_object_unref0 (self->priv->_to_pixbuf); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + _g_object_unref0 (self->priv->_to_pixbuf); #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_to_pixbuf = _tmp1_; + self->priv->_to_pixbuf = _tmp1_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "to-pixbuf"); -#line 636 "TransitionsInterfaces.c" + g_object_notify ((GObject *) self, "to-pixbuf"); +#line 699 "TransitionsInterfaces.c" + } } -void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle* result) { - GdkRectangle _tmp0_ = {0}; +void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result) { + GdkRectangle _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -646,26 +710,31 @@ void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRecta *result = _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return; -#line 650 "TransitionsInterfaces.c" +#line 714 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle* value) { - GdkRectangle _tmp0_ = {0}; +static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle * value) { + GdkRectangle old_value; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = *value; + if (_cairo_rectangle_int_equal (value, (spit_transitions_visuals_get_to_pos (self, &old_value), &old_value)) != TRUE) { +#line 724 "TransitionsInterfaces.c" + GdkRectangle _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_to_pos = _tmp0_; + _tmp0_ = *value; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "to-pos"); -#line 664 "TransitionsInterfaces.c" + self->priv->_to_pos = _tmp0_; +#line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "to-pos"); +#line 732 "TransitionsInterfaces.c" + } } -void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA* result) { - GdkRGBA _tmp0_ = {0}; +void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result) { + GdkRGBA _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -674,21 +743,75 @@ void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGB *result = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return; -#line 678 "TransitionsInterfaces.c" +#line 747 "TransitionsInterfaces.c" +} + + +static gboolean _gdk_rgba_equal (const GdkRGBA * s1, const GdkRGBA * s2) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1 == s2) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return TRUE; +#line 756 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1 == NULL) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 762 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s2 == NULL) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 768 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->red != s2->red) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 774 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->green != s2->green) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 780 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->blue != s2->blue) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 786 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->alpha != s2->alpha) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 792 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return TRUE; +#line 796 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA* value) { - GdkRGBA _tmp0_ = {0}; +static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA * value) { + GdkRGBA old_value; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = *value; + if (_gdk_rgba_equal (value, (spit_transitions_visuals_get_bg_color (self, &old_value), &old_value)) != TRUE) { +#line 806 "TransitionsInterfaces.c" + GdkRGBA _tmp0_; +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + _tmp0_ = *value; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_bg_color = _tmp0_; + self->priv->_bg_color = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "bg-color"); -#line 692 "TransitionsInterfaces.c" + g_object_notify ((GObject *) self, "bg-color"); +#line 814 "TransitionsInterfaces.c" + } } @@ -698,77 +821,77 @@ 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 = (void (*)(SpitTransitionsVisuals*)) 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 = (void (*)(SpitTransitionsVisuals*)) 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 = (void (*)(SpitTransitionsVisuals*)) 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 = (void (*)(SpitTransitionsVisuals*)) 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 = (void (*)(SpitTransitionsVisuals*)) 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 = (void (*)(SpitTransitionsVisuals*)) 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 = (void (*)(SpitTransitionsVisuals*)) 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 = (void (*)(SpitTransitionsVisuals*)) 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" G_OBJECT_CLASS (klass)->set_property = _vala_spit_transitions_visuals_set_property; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->finalize = spit_transitions_visuals_finalize; -#line 723 "TransitionsInterfaces.c" +#line 846 "TransitionsInterfaces.c" /** * Returns the starting pixbuf (the pixbuf currently on the display). * * If transitioning from a blank screen, this will return null. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 731 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 854 "TransitionsInterfaces.c" /** * Returns the position of the starting pixbuf on the display. * * If transitioning from a blank screen, this will be zeroed. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 739 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 862 "TransitionsInterfaces.c" /** * Returns the ending pixbuf (the pixbuf that the transition should result in). * * If transitioning to a blank screen, this will return null. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 747 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 870 "TransitionsInterfaces.c" /** * Returns the position of the ending pixbuf on the display. * * If transitioning to a blank screen, this will be zeroed. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 755 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 878 "TransitionsInterfaces.c" /** * Returns the background color of the viewport. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_BG_COLOR, g_param_spec_boxed ("bg-color", "bg-color", "bg-color", gdk_rgba_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 761 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY, g_param_spec_boxed ("bg-color", "bg-color", "bg-color", gdk_rgba_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 884 "TransitionsInterfaces.c" } static void spit_transitions_visuals_instance_init (SpitTransitionsVisuals * self) { #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self->priv = SPIT_TRANSITIONS_VISUALS_GET_PRIVATE (self); -#line 768 "TransitionsInterfaces.c" +#line 891 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_finalize (GObject* obj) { +static void spit_transitions_visuals_finalize (GObject * obj) { SpitTransitionsVisuals * self; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisuals); @@ -778,7 +901,7 @@ static void spit_transitions_visuals_finalize (GObject* obj) { _g_object_unref0 (self->priv->_to_pixbuf); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (spit_transitions_visuals_parent_class)->finalize (obj); -#line 782 "TransitionsInterfaces.c" +#line 905 "TransitionsInterfaces.c" } @@ -814,63 +937,63 @@ static void _vala_spit_transitions_visuals_get_property (GObject * object, guint #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" switch (property_id) { #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF: + case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_object (value, spit_transitions_visuals_get_from_pixbuf (self)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_FROM_POS: -#line 825 "TransitionsInterfaces.c" + case SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY: +#line 948 "TransitionsInterfaces.c" { GdkRectangle boxed; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_get_from_pos (self, &boxed); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_boxed (value, &boxed); -#line 832 "TransitionsInterfaces.c" +#line 955 "TransitionsInterfaces.c" } #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF: + case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_object (value, spit_transitions_visuals_get_to_pixbuf (self)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_TO_POS: -#line 844 "TransitionsInterfaces.c" + case SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY: +#line 967 "TransitionsInterfaces.c" { GdkRectangle boxed; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_get_to_pos (self, &boxed); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_boxed (value, &boxed); -#line 851 "TransitionsInterfaces.c" +#line 974 "TransitionsInterfaces.c" } #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_BG_COLOR: -#line 857 "TransitionsInterfaces.c" + case SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY: +#line 980 "TransitionsInterfaces.c" { GdkRGBA boxed; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_get_bg_color (self, &boxed); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_boxed (value, &boxed); -#line 864 "TransitionsInterfaces.c" +#line 987 "TransitionsInterfaces.c" } #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 868 "TransitionsInterfaces.c" +#line 991 "TransitionsInterfaces.c" default: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 874 "TransitionsInterfaces.c" +#line 997 "TransitionsInterfaces.c" } } @@ -881,51 +1004,51 @@ static void _vala_spit_transitions_visuals_set_property (GObject * object, guint #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" switch (property_id) { #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF: + case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_from_pixbuf (self, g_value_get_object (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_FROM_POS: + case SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_from_pos (self, g_value_get_boxed (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF: + case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_to_pixbuf (self, g_value_get_object (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_TO_POS: + case SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_to_pos (self, g_value_get_boxed (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_BG_COLOR: + case SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_bg_color (self, g_value_get_boxed (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 914 "TransitionsInterfaces.c" +#line 1037 "TransitionsInterfaces.c" default: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 920 "TransitionsInterfaces.c" +#line 1043 "TransitionsInterfaces.c" } } SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec) { SpitTransitionsMotion * self = NULL; - SpitTransitionsDirection _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + SpitTransitionsDirection _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = (SpitTransitionsMotion*) g_object_new (object_type, NULL); #line 158 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -942,14 +1065,14 @@ SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, Spi spit_transitions_motion_set_duration_msec (self, _tmp2_); #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return self; -#line 946 "TransitionsInterfaces.c" +#line 1069 "TransitionsInterfaces.c" } SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec) { #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return spit_transitions_motion_construct (SPIT_TRANSITIONS_TYPE_MOTION, direction, fps, duration_msec); -#line 953 "TransitionsInterfaces.c" +#line 1076 "TransitionsInterfaces.c" } @@ -959,9 +1082,9 @@ SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection dir */ gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, gint frame_number) { gdouble result = 0.0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 167 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0.0); #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -974,7 +1097,7 @@ gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, gint fra result = ((gdouble) _tmp0_) / ((gdouble) _tmp2_); #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 978 "TransitionsInterfaces.c" +#line 1101 "TransitionsInterfaces.c" } @@ -987,7 +1110,7 @@ void spit_transitions_motion_reserved0 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 174 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved0 (self); -#line 991 "TransitionsInterfaces.c" +#line 1114 "TransitionsInterfaces.c" } @@ -1000,7 +1123,7 @@ void spit_transitions_motion_reserved1 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 175 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved1 (self); -#line 1004 "TransitionsInterfaces.c" +#line 1127 "TransitionsInterfaces.c" } @@ -1013,7 +1136,7 @@ void spit_transitions_motion_reserved2 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 176 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved2 (self); -#line 1017 "TransitionsInterfaces.c" +#line 1140 "TransitionsInterfaces.c" } @@ -1026,7 +1149,7 @@ void spit_transitions_motion_reserved3 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 177 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved3 (self); -#line 1030 "TransitionsInterfaces.c" +#line 1153 "TransitionsInterfaces.c" } @@ -1039,7 +1162,7 @@ void spit_transitions_motion_reserved4 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 178 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved4 (self); -#line 1043 "TransitionsInterfaces.c" +#line 1166 "TransitionsInterfaces.c" } @@ -1052,7 +1175,7 @@ void spit_transitions_motion_reserved5 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 179 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved5 (self); -#line 1056 "TransitionsInterfaces.c" +#line 1179 "TransitionsInterfaces.c" } @@ -1065,7 +1188,7 @@ void spit_transitions_motion_reserved6 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 180 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved6 (self); -#line 1069 "TransitionsInterfaces.c" +#line 1192 "TransitionsInterfaces.c" } @@ -1078,13 +1201,13 @@ void spit_transitions_motion_reserved7 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 181 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved7 (self); -#line 1082 "TransitionsInterfaces.c" +#line 1205 "TransitionsInterfaces.c" } SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsMotion* self) { SpitTransitionsDirection result; - SpitTransitionsDirection _tmp0_ = 0; + SpitTransitionsDirection _tmp0_; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1093,27 +1216,31 @@ SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsM result = _tmp0_; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1097 "TransitionsInterfaces.c" +#line 1220 "TransitionsInterfaces.c" } static void spit_transitions_motion_set_direction (SpitTransitionsMotion* self, SpitTransitionsDirection value) { - SpitTransitionsDirection _tmp0_ = 0; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_motion_get_direction (self) != value) { +#line 1229 "TransitionsInterfaces.c" + SpitTransitionsDirection _tmp0_; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_direction = _tmp0_; + _tmp0_ = value; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "direction"); -#line 1111 "TransitionsInterfaces.c" + self->priv->_direction = _tmp0_; +#line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "direction"); +#line 1237 "TransitionsInterfaces.c" + } } gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1122,27 +1249,31 @@ gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self) { result = _tmp0_; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1126 "TransitionsInterfaces.c" +#line 1253 "TransitionsInterfaces.c" } static void spit_transitions_motion_set_fps (SpitTransitionsMotion* self, gint value) { - gint _tmp0_ = 0; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_motion_get_fps (self) != value) { +#line 1262 "TransitionsInterfaces.c" + gint _tmp0_; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_fps = _tmp0_; + _tmp0_ = value; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "fps"); -#line 1140 "TransitionsInterfaces.c" + self->priv->_fps = _tmp0_; +#line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "fps"); +#line 1270 "TransitionsInterfaces.c" + } } gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1151,28 +1282,32 @@ gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self) { result = _tmp0_; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1155 "TransitionsInterfaces.c" +#line 1286 "TransitionsInterfaces.c" } static void spit_transitions_motion_set_duration_msec (SpitTransitionsMotion* self, gint value) { - gint _tmp0_ = 0; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_motion_get_duration_msec (self) != value) { +#line 1295 "TransitionsInterfaces.c" + gint _tmp0_; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_duration_msec = _tmp0_; + _tmp0_ = value; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "duration-msec"); -#line 1169 "TransitionsInterfaces.c" + self->priv->_duration_msec = _tmp0_; +#line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "duration-msec"); +#line 1303 "TransitionsInterfaces.c" + } } gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self) { gint result; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; #line 143 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 144 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1183,13 +1318,13 @@ gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self) { result = (gint) (((gdouble) _tmp0_) * (((gdouble) _tmp1_) / 1000.0)); #line 144 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1187 "TransitionsInterfaces.c" +#line 1322 "TransitionsInterfaces.c" } gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 152 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 153 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1198,7 +1333,7 @@ gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self) { result = (gint) (1000.0 / ((gdouble) _tmp0_)); #line 153 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1202 "TransitionsInterfaces.c" +#line 1337 "TransitionsInterfaces.c" } @@ -1208,76 +1343,76 @@ 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 = (void (*)(SpitTransitionsMotion*)) 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 = (void (*)(SpitTransitionsMotion*)) 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 = (void (*)(SpitTransitionsMotion*)) 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 = (void (*)(SpitTransitionsMotion*)) 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 = (void (*)(SpitTransitionsMotion*)) 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 = (void (*)(SpitTransitionsMotion*)) 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 = (void (*)(SpitTransitionsMotion*)) 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 = (void (*)(SpitTransitionsMotion*)) 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" G_OBJECT_CLASS (klass)->set_property = _vala_spit_transitions_motion_set_property; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->finalize = spit_transitions_motion_finalize; -#line 1233 "TransitionsInterfaces.c" +#line 1368 "TransitionsInterfaces.c" /** * Returns the direction the transition should occur in (if pertinent to the {@link Effect}. */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DIRECTION, g_param_spec_enum ("direction", "direction", "direction", SPIT_TRANSITIONS_TYPE_DIRECTION, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1239 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY, g_param_spec_enum ("direction", "direction", "direction", SPIT_TRANSITIONS_TYPE_DIRECTION, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1374 "TransitionsInterfaces.c" /** * Returns the frames per second of the {@link Effect}. */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_FPS, g_param_spec_int ("fps", "fps", "fps", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1245 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_FPS_PROPERTY, g_param_spec_int ("fps", "fps", "fps", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1380 "TransitionsInterfaces.c" /** * Returns the amount of time the transition should take (in milliseconds). */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DURATION_MSEC, g_param_spec_int ("duration-msec", "duration-msec", "duration-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1251 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY, g_param_spec_int ("duration-msec", "duration-msec", "duration-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1386 "TransitionsInterfaces.c" /** * Returns the number of frames that should be required to perform the transition in the * expected {@link duration_msec}. */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES, g_param_spec_int ("total-frames", "total-frames", "total-frames", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1258 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY, g_param_spec_int ("total-frames", "total-frames", "total-frames", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1393 "TransitionsInterfaces.c" /** * Returns the approximate time between each frame draw (in milliseconds). */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TICK_MSEC, g_param_spec_int ("tick-msec", "tick-msec", "tick-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1264 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY, g_param_spec_int ("tick-msec", "tick-msec", "tick-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1399 "TransitionsInterfaces.c" } static void spit_transitions_motion_instance_init (SpitTransitionsMotion * self) { #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self->priv = SPIT_TRANSITIONS_MOTION_GET_PRIVATE (self); -#line 1271 "TransitionsInterfaces.c" +#line 1406 "TransitionsInterfaces.c" } -static void spit_transitions_motion_finalize (GObject* obj) { +static void spit_transitions_motion_finalize (GObject * obj) { SpitTransitionsMotion * self; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotion); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (spit_transitions_motion_parent_class)->finalize (obj); -#line 1281 "TransitionsInterfaces.c" +#line 1416 "TransitionsInterfaces.c" } @@ -1305,42 +1440,42 @@ static void _vala_spit_transitions_motion_get_property (GObject * object, guint #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" switch (property_id) { #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_DIRECTION: + case SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_enum (value, spit_transitions_motion_get_direction (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_FPS: + case SPIT_TRANSITIONS_MOTION_FPS_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_int (value, spit_transitions_motion_get_fps (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_DURATION_MSEC: + case SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_int (value, spit_transitions_motion_get_duration_msec (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES: + case SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_int (value, spit_transitions_motion_get_total_frames (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_TICK_MSEC: + case SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_int (value, spit_transitions_motion_get_tick_msec (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1338 "TransitionsInterfaces.c" +#line 1473 "TransitionsInterfaces.c" default: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1344 "TransitionsInterfaces.c" +#line 1479 "TransitionsInterfaces.c" } } @@ -1351,30 +1486,30 @@ static void _vala_spit_transitions_motion_set_property (GObject * object, guint #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" switch (property_id) { #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_DIRECTION: + case SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_motion_set_direction (self, g_value_get_enum (value)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_FPS: + case SPIT_TRANSITIONS_MOTION_FPS_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_motion_set_fps (self, g_value_get_int (value)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_DURATION_MSEC: + case SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_motion_set_duration_msec (self, g_value_get_int (value)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1372 "TransitionsInterfaces.c" +#line 1507 "TransitionsInterfaces.c" default: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1378 "TransitionsInterfaces.c" +#line 1513 "TransitionsInterfaces.c" } } @@ -1387,7 +1522,7 @@ SpitTransitionsEffect* spit_transitions_descriptor_create (SpitTransitionsDescri g_return_val_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self), NULL); #line 191 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->create (self, host); -#line 1391 "TransitionsInterfaces.c" +#line 1526 "TransitionsInterfaces.c" } @@ -1400,7 +1535,7 @@ void spit_transitions_descriptor_reserved0 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 196 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved0 (self); -#line 1404 "TransitionsInterfaces.c" +#line 1539 "TransitionsInterfaces.c" } @@ -1413,7 +1548,7 @@ void spit_transitions_descriptor_reserved1 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 197 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved1 (self); -#line 1417 "TransitionsInterfaces.c" +#line 1552 "TransitionsInterfaces.c" } @@ -1426,7 +1561,7 @@ void spit_transitions_descriptor_reserved2 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 198 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved2 (self); -#line 1430 "TransitionsInterfaces.c" +#line 1565 "TransitionsInterfaces.c" } @@ -1439,7 +1574,7 @@ void spit_transitions_descriptor_reserved3 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 199 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved3 (self); -#line 1443 "TransitionsInterfaces.c" +#line 1578 "TransitionsInterfaces.c" } @@ -1452,7 +1587,7 @@ void spit_transitions_descriptor_reserved4 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 200 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved4 (self); -#line 1456 "TransitionsInterfaces.c" +#line 1591 "TransitionsInterfaces.c" } @@ -1465,7 +1600,7 @@ void spit_transitions_descriptor_reserved5 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 201 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved5 (self); -#line 1469 "TransitionsInterfaces.c" +#line 1604 "TransitionsInterfaces.c" } @@ -1478,7 +1613,7 @@ void spit_transitions_descriptor_reserved6 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 202 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved6 (self); -#line 1482 "TransitionsInterfaces.c" +#line 1617 "TransitionsInterfaces.c" } @@ -1491,7 +1626,7 @@ void spit_transitions_descriptor_reserved7 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 203 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved7 (self); -#line 1495 "TransitionsInterfaces.c" +#line 1630 "TransitionsInterfaces.c" } @@ -1518,7 +1653,7 @@ static void spit_transitions_descriptor_base_init (SpitTransitionsDescriptorIfac iface->reserved6 = spit_transitions_descriptor_real_reserved6; #line 187 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" iface->reserved7 = spit_transitions_descriptor_real_reserved7; -#line 1522 "TransitionsInterfaces.c" +#line 1657 "TransitionsInterfaces.c" } } @@ -1555,7 +1690,7 @@ void spit_transitions_effect_get_fps (SpitTransitionsEffect* self, gint* desired g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 240 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->get_fps (self, desired_fps, min_fps); -#line 1559 "TransitionsInterfaces.c" +#line 1694 "TransitionsInterfaces.c" } @@ -1569,7 +1704,7 @@ void spit_transitions_effect_start (SpitTransitionsEffect* self, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 247 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->start (self, visuals, motion); -#line 1573 "TransitionsInterfaces.c" +#line 1708 "TransitionsInterfaces.c" } @@ -1581,7 +1716,7 @@ gboolean spit_transitions_effect_needs_clear_background (SpitTransitionsEffect* g_return_val_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self), FALSE); #line 252 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->needs_clear_background (self); -#line 1585 "TransitionsInterfaces.c" +#line 1720 "TransitionsInterfaces.c" } @@ -1601,7 +1736,7 @@ void spit_transitions_effect_paint (SpitTransitionsEffect* self, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 265 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->paint (self, visuals, motion, ctx, width, height, frame_number); -#line 1605 "TransitionsInterfaces.c" +#line 1740 "TransitionsInterfaces.c" } @@ -1619,7 +1754,7 @@ void spit_transitions_effect_advance (SpitTransitionsEffect* self, SpitTransitio g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 277 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->advance (self, visuals, motion, frame_number); -#line 1623 "TransitionsInterfaces.c" +#line 1758 "TransitionsInterfaces.c" } @@ -1633,7 +1768,7 @@ void spit_transitions_effect_cancel (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 284 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->cancel (self); -#line 1637 "TransitionsInterfaces.c" +#line 1772 "TransitionsInterfaces.c" } @@ -1646,7 +1781,7 @@ void spit_transitions_effect_reserved0 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 289 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved0 (self); -#line 1650 "TransitionsInterfaces.c" +#line 1785 "TransitionsInterfaces.c" } @@ -1659,7 +1794,7 @@ void spit_transitions_effect_reserved1 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 290 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved1 (self); -#line 1663 "TransitionsInterfaces.c" +#line 1798 "TransitionsInterfaces.c" } @@ -1672,7 +1807,7 @@ void spit_transitions_effect_reserved2 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 291 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved2 (self); -#line 1676 "TransitionsInterfaces.c" +#line 1811 "TransitionsInterfaces.c" } @@ -1685,7 +1820,7 @@ void spit_transitions_effect_reserved3 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 292 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved3 (self); -#line 1689 "TransitionsInterfaces.c" +#line 1824 "TransitionsInterfaces.c" } @@ -1698,7 +1833,7 @@ void spit_transitions_effect_reserved4 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 293 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved4 (self); -#line 1702 "TransitionsInterfaces.c" +#line 1837 "TransitionsInterfaces.c" } @@ -1711,7 +1846,7 @@ void spit_transitions_effect_reserved5 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 294 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved5 (self); -#line 1715 "TransitionsInterfaces.c" +#line 1850 "TransitionsInterfaces.c" } @@ -1724,7 +1859,7 @@ void spit_transitions_effect_reserved6 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 295 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved6 (self); -#line 1728 "TransitionsInterfaces.c" +#line 1863 "TransitionsInterfaces.c" } @@ -1737,7 +1872,7 @@ void spit_transitions_effect_reserved7 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 296 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved7 (self); -#line 1741 "TransitionsInterfaces.c" +#line 1876 "TransitionsInterfaces.c" } @@ -1764,7 +1899,7 @@ static void spit_transitions_effect_base_init (SpitTransitionsEffectIface * ifac iface->reserved6 = spit_transitions_effect_real_reserved6; #line 229 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" iface->reserved7 = spit_transitions_effect_real_reserved7; -#line 1768 "TransitionsInterfaces.c" +#line 1903 "TransitionsInterfaces.c" } } |