diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:51:46 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:51:46 +0200 |
| commit | 9e7cd144725a270e0460b21747619f447ca87684 (patch) | |
| tree | 77916a766425839c1a2466afd2eb1244371b6b9b /plugins | |
| parent | 3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff) | |
New upstream version 0.26.1upstream/0.26.1
Diffstat (limited to 'plugins')
50 files changed, 750 insertions, 739 deletions
diff --git a/plugins/authenticator/shotwell-authenticator.h b/plugins/authenticator/shotwell-authenticator.h index c2e469c..d73d0d0 100644 --- a/plugins/authenticator/shotwell-authenticator.h +++ b/plugins/authenticator/shotwell-authenticator.h @@ -1,4 +1,4 @@ -/* shotwell-authenticator.h generated by valac 0.34.4, the Vala compiler, do not modify */ +/* shotwell-authenticator.h generated by valac 0.34.7, the Vala compiler, do not modify */ #ifndef __PLUGINS_AUTHENTICATOR_SHOTWELL_AUTHENTICATOR_H__ diff --git a/plugins/authenticator/shotwell-authenticator.vapi b/plugins/authenticator/shotwell-authenticator.vapi index a978f84..3271694 100644 --- a/plugins/authenticator/shotwell-authenticator.vapi +++ b/plugins/authenticator/shotwell-authenticator.vapi @@ -1,4 +1,4 @@ -/* shotwell-authenticator.vapi generated by valac 0.34.4, do not modify. */ +/* shotwell-authenticator.vapi generated by valac 0.34.7, do not modify. */ namespace Publishing { namespace Authenticator { diff --git a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c index 8db6ac0..967e976 100644 --- a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c +++ b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c @@ -1,4 +1,4 @@ -/* FacebookPublishingAuthenticator.c generated by valac 0.34.4, the Vala compiler +/* FacebookPublishingAuthenticator.c generated by valac 0.34.7, the Vala compiler * generated from FacebookPublishingAuthenticator.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1345,7 +1345,7 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_c #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class = g_type_class_peek_parent (klass); #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" - ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load; + ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load; #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize; #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala" diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c index 033eb84..d0d74d4 100644 --- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c +++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c @@ -1,4 +1,4 @@ -/* FlickrPublishingAuthenticator.c generated by valac 0.34.4, the Vala compiler +/* FlickrPublishingAuthenticator.c generated by valac 0.34.7, the Vala compiler * generated from FlickrPublishingAuthenticator.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -462,7 +462,7 @@ static void publishing_authenticator_shotwell_flickr_transaction_class_init (Pub #line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" publishing_authenticator_shotwell_flickr_transaction_parent_class = g_type_class_peek_parent (klass); #line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_authenticator_shotwell_flickr_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_authenticator_shotwell_flickr_transaction_real_execute; #line 464 "FlickrPublishingAuthenticator.c" } @@ -1499,7 +1499,7 @@ static void publishing_authenticator_shotwell_flickr_session_class_init (Publish #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrSessionPrivate)); #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_authenticator_shotwell_flickr_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_authenticator_shotwell_flickr_session_real_is_authenticated; #line 1497 "FlickrPublishingAuthenticator.c" } diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.c b/plugins/authenticator/shotwell/GoogleAuthenticator.c index 938d8c4..400d4f1 100644 --- a/plugins/authenticator/shotwell/GoogleAuthenticator.c +++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c @@ -1,4 +1,4 @@ -/* GoogleAuthenticator.c generated by valac 0.34.4, the Vala compiler +/* GoogleAuthenticator.c generated by valac 0.34.7, the Vala compiler * generated from GoogleAuthenticator.vala, do not modify */ @@ -586,7 +586,7 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_cla #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala" publishing_authenticator_shotwell_google_web_authentication_pane_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala" - ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load; + ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load; #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala" G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_web_authentication_pane_finalize; #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala" @@ -677,7 +677,7 @@ static void publishing_authenticator_shotwell_google_session_class_init (Publish #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala" ((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_authenticator_shotwell_google_session_finalize; #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_authenticator_shotwell_google_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_authenticator_shotwell_google_session_real_is_authenticated; #line 681 "GoogleAuthenticator.c" } diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c index fe03b0e..248c757 100644 --- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c +++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c @@ -1,4 +1,4 @@ -/* ShotwellAuthenticatorFactory.c generated by valac 0.34.4, the Vala compiler +/* ShotwellAuthenticatorFactory.c generated by valac 0.34.7, the Vala compiler * generated from ShotwellAuthenticatorFactory.vala, do not modify */ @@ -135,7 +135,7 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory); #line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" - _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" list = _tmp0_; #line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala" diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c index 3e6201b..69bbe30 100644 --- a/plugins/common/BuilderPane.c +++ b/plugins/common/BuilderPane.c @@ -1,4 +1,4 @@ -/* BuilderPane.c generated by valac 0.34.4, the Vala compiler +/* BuilderPane.c generated by valac 0.34.7, the Vala compiler * generated from BuilderPane.vala, do not modify */ /* Copyright 2016 Jens Georg <mail@jensge.org> @@ -461,13 +461,13 @@ static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsComm #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonBuilderPanePrivate)); #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - ((GObjectClass *) klass)->constructed = shotwell_plugins_common_builder_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) shotwell_plugins_common_builder_pane_real_constructed; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->get_default_widget = shotwell_plugins_common_builder_pane_real_get_default_widget; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->get_default_widget = (GtkWidget* (*)(ShotwellPluginsCommonBuilderPane*)) shotwell_plugins_common_builder_pane_real_get_default_widget; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = shotwell_plugins_common_builder_pane_real_on_pane_installed; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*)(ShotwellPluginsCommonBuilderPane*)) shotwell_plugins_common_builder_pane_real_on_pane_installed; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_uninstalled = shotwell_plugins_common_builder_pane_real_on_pane_uninstalled; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_uninstalled = (void (*)(ShotwellPluginsCommonBuilderPane*)) shotwell_plugins_common_builder_pane_real_on_pane_uninstalled; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_builder_pane_get_property; #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala" diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c index 1ae73ba..5a5d29f 100644 --- a/plugins/common/RESTSupport.c +++ b/plugins/common/RESTSupport.c @@ -1,4 +1,4 @@ -/* RESTSupport.c generated by valac 0.34.4, the Vala compiler +/* RESTSupport.c generated by valac 0.34.7, the Vala compiler * generated from RESTSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -754,11 +754,12 @@ void publishing_rest_support_session_notify_authentication_failed (PublishingRES static gboolean publishing_rest_support_session_real_is_authenticated (PublishingRESTSupportSession* self) { + gboolean _tmp0_ = FALSE; #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - return FALSE; -#line 761 "RESTSupport.c" + return _tmp0_; +#line 762 "RESTSupport.c" } @@ -767,7 +768,7 @@ gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupport g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE); #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self); -#line 770 "RESTSupport.c" +#line 771 "RESTSupport.c" } @@ -785,7 +786,7 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe result = _tmp1_; #line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 788 "RESTSupport.c" +#line 789 "RESTSupport.c" } @@ -799,7 +800,7 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes _tmp0_ = self->priv->soup_session; #line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" soup_session_abort (_tmp0_); -#line 802 "RESTSupport.c" +#line 803 "RESTSupport.c" } @@ -814,14 +815,14 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES result = _tmp0_; #line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 817 "RESTSupport.c" +#line 818 "RESTSupport.c" } static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) { #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg); -#line 824 "RESTSupport.c" +#line 825 "RESTSupport.c" } @@ -842,7 +843,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes if (_tmp0_) { #line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 845 "RESTSupport.c" +#line 846 "RESTSupport.c" } #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = self->priv->soup_session; @@ -860,7 +861,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE); #line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self); -#line 863 "RESTSupport.c" +#line 864 "RESTSupport.c" } @@ -877,14 +878,14 @@ void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* _tmp1_ = self->priv->soup_session; #line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_object_set (_tmp1_, "ssl-strict", FALSE, NULL); -#line 880 "RESTSupport.c" +#line 881 "RESTSupport.c" } static void publishing_rest_support_value_session_init (GValue* value) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 887 "RESTSupport.c" +#line 888 "RESTSupport.c" } @@ -893,7 +894,7 @@ static void publishing_rest_support_value_session_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_unref (value->data[0].v_pointer); -#line 896 "RESTSupport.c" +#line 897 "RESTSupport.c" } } @@ -903,11 +904,11 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_ if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer); -#line 906 "RESTSupport.c" +#line 907 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 910 "RESTSupport.c" +#line 911 "RESTSupport.c" } } @@ -915,37 +916,37 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_ static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 918 "RESTSupport.c" +#line 919 "RESTSupport.c" } static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 925 "RESTSupport.c" +#line 926 "RESTSupport.c" PublishingRESTSupportSession* object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 932 "RESTSupport.c" +#line 933 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 936 "RESTSupport.c" +#line 937 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_session_ref (object); -#line 940 "RESTSupport.c" +#line 941 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 944 "RESTSupport.c" +#line 945 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 948 "RESTSupport.c" +#line 949 "RESTSupport.c" } @@ -956,25 +957,25 @@ static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* v if (!object_p) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 959 "RESTSupport.c" +#line 960 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 965 "RESTSupport.c" +#line 966 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 969 "RESTSupport.c" +#line 970 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_session_ref (value->data[0].v_pointer); -#line 973 "RESTSupport.c" +#line 974 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 977 "RESTSupport.c" +#line 978 "RESTSupport.c" } @@ -988,7 +989,7 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 991 "RESTSupport.c" +#line 992 "RESTSupport.c" } @@ -997,7 +998,7 @@ gpointer publishing_rest_support_value_get_session (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 1000 "RESTSupport.c" +#line 1001 "RESTSupport.c" } @@ -1017,17 +1018,17 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_ref (value->data[0].v_pointer); -#line 1020 "RESTSupport.c" +#line 1021 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1024 "RESTSupport.c" +#line 1025 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_unref (old); -#line 1030 "RESTSupport.c" +#line 1031 "RESTSupport.c" } } @@ -1046,17 +1047,17 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 1049 "RESTSupport.c" +#line 1050 "RESTSupport.c" } else { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1053 "RESTSupport.c" +#line 1054 "RESTSupport.c" } #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_session_unref (old); -#line 1059 "RESTSupport.c" +#line 1060 "RESTSupport.c" } } @@ -1069,14 +1070,14 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportSessionPrivate)); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_rest_support_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_rest_support_session_real_is_authenticated; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_new ("wire_message_unqueued", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, soup_message_get_type ()); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_new ("authentication_failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); -#line 1079 "RESTSupport.c" +#line 1080 "RESTSupport.c" } @@ -1091,7 +1092,7 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport self->priv->transactions_stopped = FALSE; #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 1094 "RESTSupport.c" +#line 1095 "RESTSupport.c" } @@ -1105,7 +1106,7 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi _g_free0 (self->priv->endpoint_url); #line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (self->priv->soup_session); -#line 1108 "RESTSupport.c" +#line 1109 "RESTSupport.c" } @@ -1130,7 +1131,7 @@ gpointer publishing_rest_support_session_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 1133 "RESTSupport.c" +#line 1134 "RESTSupport.c" } @@ -1143,7 +1144,7 @@ void publishing_rest_support_session_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1146 "RESTSupport.c" +#line 1147 "RESTSupport.c" } } @@ -1154,7 +1155,7 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM switch (self) { #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET: -#line 1157 "RESTSupport.c" +#line 1158 "RESTSupport.c" { gchar* _tmp0_ = NULL; #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1163,11 +1164,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM result = _tmp0_; #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1166 "RESTSupport.c" +#line 1167 "RESTSupport.c" } #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT: -#line 1170 "RESTSupport.c" +#line 1171 "RESTSupport.c" { gchar* _tmp1_ = NULL; #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1176,11 +1177,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM result = _tmp1_; #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1179 "RESTSupport.c" +#line 1180 "RESTSupport.c" } #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST: -#line 1183 "RESTSupport.c" +#line 1184 "RESTSupport.c" { gchar* _tmp2_ = NULL; #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1189,13 +1190,13 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM result = _tmp2_; #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1192 "RESTSupport.c" +#line 1193 "RESTSupport.c" } default: { #line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value"); -#line 1198 "RESTSupport.c" +#line 1199 "RESTSupport.c" } } } @@ -1214,7 +1215,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET; #line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1217 "RESTSupport.c" +#line 1218 "RESTSupport.c" } else { const gchar* _tmp1_ = NULL; #line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1225,7 +1226,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT; #line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1228 "RESTSupport.c" +#line 1229 "RESTSupport.c" } else { const gchar* _tmp2_ = NULL; #line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1236,14 +1237,14 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST; #line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1239 "RESTSupport.c" +#line 1240 "RESTSupport.c" } else { const gchar* _tmp3_ = NULL; #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = str; #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_); -#line 1246 "RESTSupport.c" +#line 1247 "RESTSupport.c" } } } @@ -1292,14 +1293,14 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType self->value = _tmp3_; #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 1295 "RESTSupport.c" +#line 1296 "RESTSupport.c" } PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) { #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value); -#line 1302 "RESTSupport.c" +#line 1303 "RESTSupport.c" } @@ -1331,7 +1332,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar result = _tmp5_; #line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1334 "RESTSupport.c" +#line 1335 "RESTSupport.c" } @@ -1340,14 +1341,14 @@ static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconst result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b); #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1343 "RESTSupport.c" +#line 1344 "RESTSupport.c" } static gpointer _publishing_rest_support_argument_ref0 (gpointer self) { #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? publishing_rest_support_argument_ref (self) : NULL; -#line 1350 "RESTSupport.c" +#line 1351 "RESTSupport.c" } @@ -1363,14 +1364,14 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin PublishingRESTSupportArgument** _tmp8_ = NULL; gint _tmp8__length1 = 0; #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp0_ = gee_tree_set_new (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, (GBoxedCopyFunc) publishing_rest_support_argument_ref, publishing_rest_support_argument_unref, _publishing_rest_support_argument_compare_gcompare_data_func, NULL, NULL); + _tmp0_ = gee_tree_set_new (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, (GBoxedCopyFunc) publishing_rest_support_argument_ref, (GDestroyNotify) publishing_rest_support_argument_unref, _publishing_rest_support_argument_compare_gcompare_data_func, NULL, NULL); #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" sorted_args = _tmp0_; #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = inputArray; #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1__length1 = inputArray_length1; -#line 1373 "RESTSupport.c" +#line 1374 "RESTSupport.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -1382,14 +1383,14 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin arg_collection_length1 = _tmp1__length1; #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) { -#line 1385 "RESTSupport.c" +#line 1386 "RESTSupport.c" PublishingRESTSupportArgument* _tmp2_ = NULL; PublishingRESTSupportArgument* arg = NULL; #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" arg = _tmp2_; -#line 1392 "RESTSupport.c" +#line 1393 "RESTSupport.c" { GeeTreeSet* _tmp3_ = NULL; PublishingRESTSupportArgument* _tmp4_ = NULL; @@ -1401,7 +1402,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _publishing_rest_support_argument_unref0 (arg); -#line 1404 "RESTSupport.c" +#line 1405 "RESTSupport.c" } } } @@ -1417,7 +1418,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin if (result_length1) { #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *result_length1 = _tmp8__length1; -#line 1420 "RESTSupport.c" +#line 1421 "RESTSupport.c" } #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp8_; @@ -1425,7 +1426,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin _g_object_unref0 (sorted_args); #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1428 "RESTSupport.c" +#line 1429 "RESTSupport.c" } @@ -1446,14 +1447,14 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument result = _tmp2_; #line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 1449 "RESTSupport.c" +#line 1450 "RESTSupport.c" } static void publishing_rest_support_value_argument_init (GValue* value) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1456 "RESTSupport.c" +#line 1457 "RESTSupport.c" } @@ -1462,7 +1463,7 @@ static void publishing_rest_support_value_argument_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_argument_unref (value->data[0].v_pointer); -#line 1465 "RESTSupport.c" +#line 1466 "RESTSupport.c" } } @@ -1472,11 +1473,11 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src if (src_value->data[0].v_pointer) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer); -#line 1475 "RESTSupport.c" +#line 1476 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 1479 "RESTSupport.c" +#line 1480 "RESTSupport.c" } } @@ -1484,37 +1485,37 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 1487 "RESTSupport.c" +#line 1488 "RESTSupport.c" } static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 1494 "RESTSupport.c" +#line 1495 "RESTSupport.c" PublishingRESTSupportArgument* object; object = collect_values[0].v_pointer; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1501 "RESTSupport.c" +#line 1502 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 1505 "RESTSupport.c" +#line 1506 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_argument_ref (object); -#line 1509 "RESTSupport.c" +#line 1510 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1513 "RESTSupport.c" +#line 1514 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 1517 "RESTSupport.c" +#line 1518 "RESTSupport.c" } @@ -1525,25 +1526,25 @@ static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue* if (!object_p) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1528 "RESTSupport.c" +#line 1529 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 1534 "RESTSupport.c" +#line 1535 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 1538 "RESTSupport.c" +#line 1539 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_argument_ref (value->data[0].v_pointer); -#line 1542 "RESTSupport.c" +#line 1543 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 1546 "RESTSupport.c" +#line 1547 "RESTSupport.c" } @@ -1557,7 +1558,7 @@ GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 1560 "RESTSupport.c" +#line 1561 "RESTSupport.c" } @@ -1566,7 +1567,7 @@ gpointer publishing_rest_support_value_get_argument (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 1569 "RESTSupport.c" +#line 1570 "RESTSupport.c" } @@ -1586,17 +1587,17 @@ void publishing_rest_support_value_set_argument (GValue* value, gpointer v_objec value->data[0].v_pointer = v_object; #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_argument_ref (value->data[0].v_pointer); -#line 1589 "RESTSupport.c" +#line 1590 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1593 "RESTSupport.c" +#line 1594 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_argument_unref (old); -#line 1599 "RESTSupport.c" +#line 1600 "RESTSupport.c" } } @@ -1615,17 +1616,17 @@ void publishing_rest_support_value_take_argument (GValue* value, gpointer v_obje g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 1618 "RESTSupport.c" +#line 1619 "RESTSupport.c" } else { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 1622 "RESTSupport.c" +#line 1623 "RESTSupport.c" } #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_argument_unref (old); -#line 1628 "RESTSupport.c" +#line 1629 "RESTSupport.c" } } @@ -1635,14 +1636,14 @@ static void publishing_rest_support_argument_class_init (PublishingRESTSupportAr publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" ((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize; -#line 1638 "RESTSupport.c" +#line 1639 "RESTSupport.c" } static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) { #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 1645 "RESTSupport.c" +#line 1646 "RESTSupport.c" } @@ -1656,7 +1657,7 @@ static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgu _g_free0 (self->key); #line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (self->value); -#line 1659 "RESTSupport.c" +#line 1660 "RESTSupport.c" } @@ -1681,7 +1682,7 @@ gpointer publishing_rest_support_argument_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 1684 "RESTSupport.c" +#line 1685 "RESTSupport.c" } @@ -1694,7 +1695,7 @@ void publishing_rest_support_argument_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self); #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1697 "RESTSupport.c" +#line 1698 "RESTSupport.c" } } @@ -1702,7 +1703,7 @@ void publishing_rest_support_argument_unref (gpointer instance) { static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) { #line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk); -#line 1705 "RESTSupport.c" +#line 1706 "RESTSupport.c" } @@ -1766,14 +1767,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self); #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 1769 "RESTSupport.c" +#line 1770 "RESTSupport.c" } PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) { #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method); -#line 1776 "RESTSupport.c" +#line 1777 "RESTSupport.c" } @@ -1823,14 +1824,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_ _g_free0 (_tmp5_); #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 1826 "RESTSupport.c" +#line 1827 "RESTSupport.c" } PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) { #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method); -#line 1833 "RESTSupport.c" +#line 1834 "RESTSupport.c" } @@ -1864,14 +1865,14 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE _tmp6_ = _tmp5_->length; #line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_emit_by_name (self, "chunk-transmitted", _tmp3_, (gint) _tmp6_); -#line 1867 "RESTSupport.c" +#line 1868 "RESTSupport.c" } static gpointer _g_error_copy0 (gpointer self) { #line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? g_error_copy (self) : NULL; -#line 1874 "RESTSupport.c" +#line 1875 "RESTSupport.c" } @@ -1891,7 +1892,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR if (_tmp0_ != _tmp1_) { #line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 1894 "RESTSupport.c" +#line 1895 "RESTSupport.c" } { SoupMessage* _tmp2_ = NULL; @@ -1903,7 +1904,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR if (G_UNLIKELY (_inner_error_ != NULL)) { #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 1906 "RESTSupport.c" +#line 1907 "RESTSupport.c" goto __catch0_spit_publishing_publishing_error; } #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1912,7 +1913,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR g_clear_error (&_inner_error_); #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 1915 "RESTSupport.c" +#line 1916 "RESTSupport.c" } } goto __finally0; @@ -1953,7 +1954,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR self->priv->err = _tmp8_; #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_error_free0 (err); -#line 1956 "RESTSupport.c" +#line 1957 "RESTSupport.c" } __finally0: #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -1964,7 +1965,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR g_clear_error (&_inner_error_); #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 1967 "RESTSupport.c" +#line 1968 "RESTSupport.c" } } @@ -1972,7 +1973,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR static gpointer _g_object_ref0 (gpointer self) { #line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? g_object_ref (self) : NULL; -#line 1975 "RESTSupport.c" +#line 1976 "RESTSupport.c" } @@ -2016,14 +2017,14 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis #line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" tls_errors = _tmp2_; #line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp4_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" list = _tmp4_; #line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = tls_errors; #line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) { -#line 2026 "RESTSupport.c" +#line 2027 "RESTSupport.c" GeeArrayList* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2033,13 +2034,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis "bsite."); #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); -#line 2035 "RESTSupport.c" +#line 2036 "RESTSupport.c" } #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ = tls_errors; #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if ((_tmp8_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) { -#line 2041 "RESTSupport.c" +#line 2042 "RESTSupport.c" GeeArrayList* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2049,13 +2050,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis " your computer’s calendar."); #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 2050 "RESTSupport.c" +#line 2051 "RESTSupport.c" } #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp11_ = tls_errors; #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if ((_tmp11_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) { -#line 2056 "RESTSupport.c" +#line 2057 "RESTSupport.c" GeeArrayList* _tmp12_ = NULL; const gchar* _tmp13_ = NULL; #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2065,13 +2066,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis "on."); #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); -#line 2065 "RESTSupport.c" +#line 2066 "RESTSupport.c" } #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp14_ = tls_errors; #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if ((_tmp14_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) { -#line 2071 "RESTSupport.c" +#line 2072 "RESTSupport.c" GeeArrayList* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2081,13 +2082,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis "upted."); #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); -#line 2080 "RESTSupport.c" +#line 2081 "RESTSupport.c" } #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp17_ = tls_errors; #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if ((_tmp17_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) { -#line 2086 "RESTSupport.c" +#line 2087 "RESTSupport.c" GeeArrayList* _tmp18_ = NULL; const gchar* _tmp19_ = NULL; #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2097,13 +2098,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis "zation that issued it."); #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); -#line 2095 "RESTSupport.c" +#line 2096 "RESTSupport.c" } #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp20_ = tls_errors; #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if ((_tmp20_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) { -#line 2101 "RESTSupport.c" +#line 2102 "RESTSupport.c" GeeArrayList* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2113,13 +2114,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis " weak encryption."); #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); -#line 2110 "RESTSupport.c" +#line 2111 "RESTSupport.c" } #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp23_ = tls_errors; #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if ((_tmp23_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) { -#line 2116 "RESTSupport.c" +#line 2117 "RESTSupport.c" GeeArrayList* _tmp24_ = NULL; const gchar* _tmp25_ = NULL; #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2129,7 +2130,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis "the date on your computer’s calendar."); #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_); -#line 2125 "RESTSupport.c" +#line 2126 "RESTSupport.c" } #line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp26_ = g_string_new (""); @@ -2138,12 +2139,12 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp27_ = list; #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp29_ = _tmp28_; #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp29_ == 1) { -#line 2139 "RESTSupport.c" +#line 2140 "RESTSupport.c" GString* _tmp30_ = NULL; GeeArrayList* _tmp31_ = NULL; gpointer _tmp32_ = NULL; @@ -2160,7 +2161,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis g_string_append (_tmp30_, _tmp33_); #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (_tmp33_); -#line 2156 "RESTSupport.c" +#line 2157 "RESTSupport.c" } else { { GeeArrayList* _entry_list = NULL; @@ -2180,7 +2181,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp36_ = _entry_list; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp38_ = _tmp37_; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2189,7 +2190,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis _entry_index = -1; #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 2185 "RESTSupport.c" +#line 2186 "RESTSupport.c" gint _tmp39_ = 0; gint _tmp40_ = 0; gint _tmp41_ = 0; @@ -2211,7 +2212,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis if (!(_tmp40_ < _tmp41_)) { #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 2207 "RESTSupport.c" +#line 2208 "RESTSupport.c" } #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp42_ = _entry_list; @@ -2229,11 +2230,11 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis g_string_append_printf (_tmp45_, "%s\n", _tmp46_); #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (entry); -#line 2225 "RESTSupport.c" +#line 2226 "RESTSupport.c" } #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (_entry_list); -#line 2229 "RESTSupport.c" +#line 2230 "RESTSupport.c" } } #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2252,15 +2253,15 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis if (cert) { #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *cert = _vala_cert; -#line 2248 "RESTSupport.c" +#line 2249 "RESTSupport.c" } else { #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (_vala_cert); -#line 2252 "RESTSupport.c" +#line 2253 "RESTSupport.c" } #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2256 "RESTSupport.c" +#line 2257 "RESTSupport.c" } @@ -2290,17 +2291,17 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr case SOUP_STATUS_OK: #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CREATED: -#line 2286 "RESTSupport.c" +#line 2287 "RESTSupport.c" { #line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 2290 "RESTSupport.c" +#line 2291 "RESTSupport.c" } #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CANT_RESOLVE: #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CANT_RESOLVE_PROXY: -#line 2296 "RESTSupport.c" +#line 2297 "RESTSupport.c" { gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -2333,7 +2334,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2329 "RESTSupport.c" +#line 2330 "RESTSupport.c" } else { #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2341,14 +2342,14 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2337 "RESTSupport.c" +#line 2338 "RESTSupport.c" } } #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CANT_CONNECT: #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_CANT_CONNECT_PROXY: -#line 2344 "RESTSupport.c" +#line 2345 "RESTSupport.c" { gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; @@ -2381,7 +2382,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2377 "RESTSupport.c" +#line 2378 "RESTSupport.c" } else { #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2389,12 +2390,12 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2385 "RESTSupport.c" +#line 2386 "RESTSupport.c" } } #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" case SOUP_STATUS_SSL_FAILED: -#line 2390 "RESTSupport.c" +#line 2391 "RESTSupport.c" { gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; @@ -2418,7 +2419,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2414 "RESTSupport.c" +#line 2415 "RESTSupport.c" } else { #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2426,7 +2427,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2422 "RESTSupport.c" +#line 2423 "RESTSupport.c" } } default: @@ -2442,7 +2443,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr _tmp23_ = _tmp22_; #line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp23_ >= ((guint) 100)) { -#line 2438 "RESTSupport.c" +#line 2439 "RESTSupport.c" gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; SoupMessage* _tmp26_ = NULL; @@ -2488,7 +2489,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2484 "RESTSupport.c" +#line 2485 "RESTSupport.c" } else { #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2496,7 +2497,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2492 "RESTSupport.c" +#line 2493 "RESTSupport.c" } } else { gchar* _tmp35_ = NULL; @@ -2530,7 +2531,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2526 "RESTSupport.c" +#line 2527 "RESTSupport.c" } else { #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2538,7 +2539,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2534 "RESTSupport.c" +#line 2535 "RESTSupport.c" } } } @@ -2555,7 +2556,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr if (_tmp45_ == NULL) { #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp42_ = TRUE; -#line 2551 "RESTSupport.c" +#line 2552 "RESTSupport.c" } else { SoupMessage* _tmp46_ = NULL; SoupMessageBody* _tmp47_ = NULL; @@ -2571,11 +2572,11 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr _tmp48__length1 = (gint) _tmp47_->length; #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp42_ = _tmp48__length1 == 0; -#line 2567 "RESTSupport.c" +#line 2568 "RESTSupport.c" } #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp42_) { -#line 2571 "RESTSupport.c" +#line 2572 "RESTSupport.c" gchar* _tmp49_ = NULL; gchar* _tmp50_ = NULL; GError* _tmp51_ = NULL; @@ -2598,7 +2599,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_propagate_error (error, _inner_error_); #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2594 "RESTSupport.c" +#line 2595 "RESTSupport.c" } else { #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2606,7 +2607,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr g_clear_error (&_inner_error_); #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2602 "RESTSupport.c" +#line 2603 "RESTSupport.c" } } } @@ -2619,17 +2620,17 @@ static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportAr result = g_new0 (PublishingRESTSupportArgument*, length + 1); #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (i = 0; i < length; i++) { -#line 2615 "RESTSupport.c" +#line 2616 "RESTSupport.c" PublishingRESTSupportArgument* _tmp0_ = NULL; #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _publishing_rest_support_argument_ref0 (self[i]); #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result[i] = _tmp0_; -#line 2621 "RESTSupport.c" +#line 2622 "RESTSupport.c" } #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2625 "RESTSupport.c" +#line 2626 "RESTSupport.c" } @@ -2659,13 +2660,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument if (result_length1) { #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *result_length1 = _tmp2__length1; -#line 2655 "RESTSupport.c" +#line 2656 "RESTSupport.c" } #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp2_; #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2661 "RESTSupport.c" +#line 2662 "RESTSupport.c" } @@ -2705,13 +2706,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a if (result_length1) { #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *result_length1 = _tmp6__length1; -#line 2701 "RESTSupport.c" +#line 2702 "RESTSupport.c" } #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp6_; #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2707 "RESTSupport.c" +#line 2708 "RESTSupport.c" } @@ -2723,14 +2724,14 @@ void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportT _tmp0_ = is_executed; #line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv->is_executed = _tmp0_; -#line 2719 "RESTSupport.c" +#line 2720 "RESTSupport.c" } static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) { #line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message); -#line 2726 "RESTSupport.c" +#line 2727 "RESTSupport.c" } @@ -2778,23 +2779,23 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* _tmp8_ = self->priv->err; #line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp8_ != NULL) { -#line 2774 "RESTSupport.c" +#line 2775 "RESTSupport.c" GError* _tmp9_ = NULL; #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ = self->priv->err; #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_emit_by_name (self, "network-error", _tmp9_); -#line 2780 "RESTSupport.c" +#line 2781 "RESTSupport.c" } else { #line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_emit_by_name (self, "completed"); -#line 2784 "RESTSupport.c" +#line 2785 "RESTSupport.c" } #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp10_ = self->priv->err; #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp10_ != NULL) { -#line 2790 "RESTSupport.c" +#line 2791 "RESTSupport.c" GError* _tmp11_ = NULL; GError* _tmp12_ = NULL; #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -2809,7 +2810,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* g_propagate_error (error, _inner_error_); #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2805 "RESTSupport.c" +#line 2806 "RESTSupport.c" } else { #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2817,7 +2818,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* g_clear_error (&_inner_error_); #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2813 "RESTSupport.c" +#line 2814 "RESTSupport.c" } } } @@ -2851,7 +2852,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method ( result = _tmp5_; #line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2847 "RESTSupport.c" +#line 2848 "RESTSupport.c" } @@ -2874,7 +2875,7 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS _tmp3_ = value; #line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_); -#line 2870 "RESTSupport.c" +#line 2871 "RESTSupport.c" } @@ -2883,7 +2884,7 @@ void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransa g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); #line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value); -#line 2879 "RESTSupport.c" +#line 2880 "RESTSupport.c" } @@ -2917,19 +2918,19 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo self->priv->use_custom_payload = FALSE; #line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 2913 "RESTSupport.c" +#line 2914 "RESTSupport.c" } #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = payload_length; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp3_ > ((gulong) 0)) { -#line 2919 "RESTSupport.c" +#line 2920 "RESTSupport.c" gulong _tmp4_ = 0UL; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = payload_length; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = _tmp4_; -#line 2925 "RESTSupport.c" +#line 2926 "RESTSupport.c" } else { const gchar* _tmp5_ = NULL; gint _tmp6_ = 0; @@ -2942,7 +2943,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo _tmp7_ = _tmp6_; #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = (gulong) _tmp7_; -#line 2938 "RESTSupport.c" +#line 2939 "RESTSupport.c" } #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" length = _tmp2_; @@ -2964,7 +2965,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0)); #line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv->use_custom_payload = TRUE; -#line 2960 "RESTSupport.c" +#line 2961 "RESTSupport.c" } @@ -2983,7 +2984,7 @@ void publishing_rest_support_transaction_set_message (PublishingRESTSupportTrans _g_object_unref0 (self->priv->message); #line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv->message = _tmp1_; -#line 2979 "RESTSupport.c" +#line 2980 "RESTSupport.c" } @@ -2998,7 +2999,7 @@ gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupp result = _tmp0_; #line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 2994 "RESTSupport.c" +#line 2995 "RESTSupport.c" } @@ -3024,14 +3025,14 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport result = _tmp3_; #line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3020 "RESTSupport.c" +#line 3021 "RESTSupport.c" } static void _vala_SoupURI_free (SoupURI* self) { #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_boxed_free (soup_uri_get_type (), self); -#line 3027 "RESTSupport.c" +#line 3028 "RESTSupport.c" } @@ -3061,7 +3062,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp g_propagate_error (error, _inner_error_); #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3057 "RESTSupport.c" +#line 3058 "RESTSupport.c" } else { #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3069,18 +3070,18 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp g_clear_error (&_inner_error_); #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3065 "RESTSupport.c" +#line 3066 "RESTSupport.c" } } #line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3070 "RESTSupport.c" +#line 3071 "RESTSupport.c" } #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = publishing_rest_support_transaction_get_method (self); #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) { -#line 3076 "RESTSupport.c" +#line 3077 "RESTSupport.c" PublishingRESTSupportArgument** _tmp2_ = NULL; gint _tmp2__length1 = 0; #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3089,25 +3090,25 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _tmp2__length1 = self->priv->arguments_length1; #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _vala_assert (_tmp2__length1 > 0, "arguments.length > 0"); -#line 3085 "RESTSupport.c" +#line 3086 "RESTSupport.c" } #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = g_strdup (""); #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" formdata_string = _tmp3_; -#line 3091 "RESTSupport.c" +#line 3092 "RESTSupport.c" { gint i = 0; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" i = 0; -#line 3096 "RESTSupport.c" +#line 3097 "RESTSupport.c" { gboolean _tmp4_ = FALSE; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = TRUE; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 3103 "RESTSupport.c" +#line 3104 "RESTSupport.c" gint _tmp6_ = 0; PublishingRESTSupportArgument** _tmp7_ = NULL; gint _tmp7__length1 = 0; @@ -3124,13 +3125,13 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp gint _tmp16__length1 = 0; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!_tmp4_) { -#line 3120 "RESTSupport.c" +#line 3121 "RESTSupport.c" gint _tmp5_ = 0; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = i; #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" i = _tmp5_ + 1; -#line 3126 "RESTSupport.c" +#line 3127 "RESTSupport.c" } #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = FALSE; @@ -3144,7 +3145,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp if (!(_tmp6_ < _tmp7__length1)) { #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 3140 "RESTSupport.c" +#line 3141 "RESTSupport.c" } #line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ = formdata_string; @@ -3176,7 +3177,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _tmp16__length1 = self->priv->arguments_length1; #line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp15_ < (_tmp16__length1 - 1)) { -#line 3172 "RESTSupport.c" +#line 3173 "RESTSupport.c" const gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3187,7 +3188,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _g_free0 (formdata_string); #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" formdata_string = _tmp18_; -#line 3183 "RESTSupport.c" +#line 3184 "RESTSupport.c" } } } @@ -3200,7 +3201,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _tmp20_ = publishing_rest_support_transaction_get_method (self); #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) { -#line 3196 "RESTSupport.c" +#line 3197 "RESTSupport.c" PublishingRESTSupportArgument** _tmp21_ = NULL; gint _tmp21__length1 = 0; #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3209,15 +3210,15 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _tmp21__length1 = self->priv->arguments_length1; #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp19_ = _tmp21__length1 > 0; -#line 3205 "RESTSupport.c" +#line 3206 "RESTSupport.c" } else { #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp19_ = FALSE; -#line 3209 "RESTSupport.c" +#line 3210 "RESTSupport.c" } #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp19_) { -#line 3213 "RESTSupport.c" +#line 3214 "RESTSupport.c" SoupMessage* _tmp22_ = NULL; SoupURI* _tmp23_ = NULL; gchar* _tmp24_ = NULL; @@ -3273,7 +3274,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp soup_message_set_uri (_tmp31_, _tmp34_); #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" __vala_SoupURI_free0 (_tmp34_); -#line 3269 "RESTSupport.c" +#line 3270 "RESTSupport.c" } else { SoupMessage* _tmp35_ = NULL; const gchar* _tmp36_ = NULL; @@ -3293,11 +3294,11 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _tmp38__length1 = _tmp37__length1; #line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1); -#line 3289 "RESTSupport.c" +#line 3290 "RESTSupport.c" } #line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv->is_executed = TRUE; -#line 3293 "RESTSupport.c" +#line 3294 "RESTSupport.c" { SoupMessage* _tmp39_ = NULL; SoupURI* _tmp40_ = NULL; @@ -3319,7 +3320,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp publishing_rest_support_transaction_send (self, &_inner_error_); #line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3315 "RESTSupport.c" +#line 3316 "RESTSupport.c" goto __finally1; } } @@ -3330,7 +3331,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _tmp43_ = old_url; #line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp43_ != NULL) { -#line 3326 "RESTSupport.c" +#line 3327 "RESTSupport.c" SoupMessage* _tmp44_ = NULL; const gchar* _tmp45_ = NULL; SoupURI* _tmp46_ = NULL; @@ -3347,7 +3348,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp soup_message_set_uri (_tmp44_, _tmp47_); #line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" __vala_SoupURI_free0 (_tmp47_); -#line 3343 "RESTSupport.c" +#line 3344 "RESTSupport.c" } } #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3364,7 +3365,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _g_free0 (formdata_string); #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3360 "RESTSupport.c" +#line 3361 "RESTSupport.c" } else { #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (url_with_query); @@ -3378,7 +3379,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp g_clear_error (&_inner_error_); #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 3374 "RESTSupport.c" +#line 3375 "RESTSupport.c" } } #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3387,7 +3388,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp _g_free0 (old_url); #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (formdata_string); -#line 3383 "RESTSupport.c" +#line 3384 "RESTSupport.c" } @@ -3396,7 +3397,7 @@ void publishing_rest_support_transaction_execute (PublishingRESTSupportTransacti g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self)); #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error); -#line 3392 "RESTSupport.c" +#line 3393 "RESTSupport.c" } @@ -3428,7 +3429,7 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr result = _tmp4_; #line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3424 "RESTSupport.c" +#line 3425 "RESTSupport.c" } @@ -3451,7 +3452,7 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu result = _tmp2_; #line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3447 "RESTSupport.c" +#line 3448 "RESTSupport.c" } @@ -3474,7 +3475,7 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp result = _tmp2_; #line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3470 "RESTSupport.c" +#line 3471 "RESTSupport.c" } @@ -3485,13 +3486,13 @@ static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* lengt *size = (*size) ? (2 * (*size)) : 4; #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 3481 "RESTSupport.c" +#line 3482 "RESTSupport.c" } #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" (*array)[(*length)++] = value; #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" (*array)[*length] = NULL; -#line 3487 "RESTSupport.c" +#line 3488 "RESTSupport.c" } @@ -3519,7 +3520,7 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_); #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_); -#line 3515 "RESTSupport.c" +#line 3516 "RESTSupport.c" } @@ -3533,7 +3534,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo _tmp1_ = self->priv->endpoint_url; #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp1_ != NULL) { -#line 3529 "RESTSupport.c" +#line 3530 "RESTSupport.c" const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -3544,7 +3545,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo _g_free0 (_tmp0_); #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _tmp3_; -#line 3540 "RESTSupport.c" +#line 3541 "RESTSupport.c" } else { PublishingRESTSupportSession* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -3556,20 +3557,20 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo _g_free0 (_tmp0_); #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _tmp5_; -#line 3552 "RESTSupport.c" +#line 3553 "RESTSupport.c" } #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = _tmp0_; #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3558 "RESTSupport.c" +#line 3559 "RESTSupport.c" } static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 3565 "RESTSupport.c" +#line 3566 "RESTSupport.c" } @@ -3587,7 +3588,7 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses result = _tmp1_; #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 3583 "RESTSupport.c" +#line 3584 "RESTSupport.c" } @@ -3606,26 +3607,26 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * data1 = closure->data; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" data2 = param_values->data[0].v_pointer; -#line 3602 "RESTSupport.c" +#line 3603 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" data1 = param_values->data[0].v_pointer; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" data2 = closure->data; -#line 3608 "RESTSupport.c" +#line 3609 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2); -#line 3614 "RESTSupport.c" +#line 3615 "RESTSupport.c" } static void publishing_rest_support_value_transaction_init (GValue* value) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 3621 "RESTSupport.c" +#line 3622 "RESTSupport.c" } @@ -3634,7 +3635,7 @@ static void publishing_rest_support_value_transaction_free_value (GValue* value) if (value->data[0].v_pointer) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_unref (value->data[0].v_pointer); -#line 3630 "RESTSupport.c" +#line 3631 "RESTSupport.c" } } @@ -3644,11 +3645,11 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue* if (src_value->data[0].v_pointer) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer); -#line 3640 "RESTSupport.c" +#line 3641 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 3644 "RESTSupport.c" +#line 3645 "RESTSupport.c" } } @@ -3656,37 +3657,37 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue* static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 3652 "RESTSupport.c" +#line 3653 "RESTSupport.c" } static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 3659 "RESTSupport.c" +#line 3660 "RESTSupport.c" PublishingRESTSupportTransaction* object; object = collect_values[0].v_pointer; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3666 "RESTSupport.c" +#line 3667 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 3670 "RESTSupport.c" +#line 3671 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_transaction_ref (object); -#line 3674 "RESTSupport.c" +#line 3675 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 3678 "RESTSupport.c" +#line 3679 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 3682 "RESTSupport.c" +#line 3683 "RESTSupport.c" } @@ -3697,25 +3698,25 @@ static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValu if (!object_p) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3693 "RESTSupport.c" +#line 3694 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 3699 "RESTSupport.c" +#line 3700 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 3703 "RESTSupport.c" +#line 3704 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer); -#line 3707 "RESTSupport.c" +#line 3708 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 3711 "RESTSupport.c" +#line 3712 "RESTSupport.c" } @@ -3729,7 +3730,7 @@ GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, c G_PARAM_SPEC (spec)->value_type = object_type; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 3725 "RESTSupport.c" +#line 3726 "RESTSupport.c" } @@ -3738,7 +3739,7 @@ gpointer publishing_rest_support_value_get_transaction (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 3734 "RESTSupport.c" +#line 3735 "RESTSupport.c" } @@ -3758,17 +3759,17 @@ void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_ob value->data[0].v_pointer = v_object; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_ref (value->data[0].v_pointer); -#line 3754 "RESTSupport.c" +#line 3755 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 3758 "RESTSupport.c" +#line 3759 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_unref (old); -#line 3764 "RESTSupport.c" +#line 3765 "RESTSupport.c" } } @@ -3787,17 +3788,17 @@ void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_o g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 3783 "RESTSupport.c" +#line 3784 "RESTSupport.c" } else { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 3787 "RESTSupport.c" +#line 3788 "RESTSupport.c" } #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_transaction_unref (old); -#line 3793 "RESTSupport.c" +#line 3794 "RESTSupport.c" } } @@ -3810,16 +3811,16 @@ static void publishing_rest_support_transaction_class_init (PublishingRESTSuppor #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportTransactionPrivate)); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_transaction_real_add_header; + ((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*)(PublishingRESTSupportTransaction*, const gchar*, const gchar*)) publishing_rest_support_transaction_real_add_header; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_rest_support_transaction_real_execute; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_new ("chunk_transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_new ("network_error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3815 "RESTSupport.c" +#line 3816 "RESTSupport.c" } @@ -3840,7 +3841,7 @@ static void publishing_rest_support_transaction_instance_init (PublishingRESTSup self->priv->endpoint_url = NULL; #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 3836 "RESTSupport.c" +#line 3837 "RESTSupport.c" } @@ -3858,7 +3859,7 @@ static void publishing_rest_support_transaction_finalize (PublishingRESTSupportT _g_error_free0 (self->priv->err); #line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (self->priv->endpoint_url); -#line 3854 "RESTSupport.c" +#line 3855 "RESTSupport.c" } @@ -3883,7 +3884,7 @@ gpointer publishing_rest_support_transaction_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 3879 "RESTSupport.c" +#line 3880 "RESTSupport.c" } @@ -3896,7 +3897,7 @@ void publishing_rest_support_transaction_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self); #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3892 "RESTSupport.c" +#line 3893 "RESTSupport.c" } } @@ -3944,21 +3945,21 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti #line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->binary_disposition_table = _tmp6_; #line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (self->message_headers); #line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->message_headers = _tmp7_; #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 3947 "RESTSupport.c" +#line 3948 "RESTSupport.c" } PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) { #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable); -#line 3954 "RESTSupport.c" +#line 3955 "RESTSupport.c" } @@ -4010,21 +4011,21 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti #line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->binary_disposition_table = _tmp7_; #line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - _tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (self->message_headers); #line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->message_headers = _tmp8_; #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 4013 "RESTSupport.c" +#line 4014 "RESTSupport.c" } PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) { #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url); -#line 4020 "RESTSupport.c" +#line 4021 "RESTSupport.c" } @@ -4047,7 +4048,7 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi _tmp2_ = value; #line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_); -#line 4043 "RESTSupport.c" +#line 4044 "RESTSupport.c" } @@ -4058,7 +4059,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type _tmp0_ = media_type; #line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { -#line 4054 "RESTSupport.c" +#line 4055 "RESTSupport.c" gchar* _tmp1_ = NULL; #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = g_strdup ("image/jpeg"); @@ -4066,14 +4067,14 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type result = _tmp1_; #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4062 "RESTSupport.c" +#line 4063 "RESTSupport.c" } else { SpitPublishingPublisherMediaType _tmp2_ = 0; #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = media_type; #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 4069 "RESTSupport.c" +#line 4070 "RESTSupport.c" gchar* _tmp3_ = NULL; #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp3_ = g_strdup ("video/mpeg"); @@ -4081,7 +4082,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type result = _tmp3_; #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4077 "RESTSupport.c" +#line 4078 "RESTSupport.c" } else { SpitPublishingPublisherMediaType _tmp4_ = 0; GEnumValue* _tmp5_; @@ -4091,7 +4092,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type _tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_); #line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_error ("RESTSupport.vala:476: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); -#line 4087 "RESTSupport.c" +#line 4088 "RESTSupport.c" } } } @@ -4100,7 +4101,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type static void _g_free0_ (gpointer var) { #line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" var = (g_free (var), NULL); -#line 4096 "RESTSupport.c" +#line 4097 "RESTSupport.c" } @@ -4151,14 +4152,14 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin result = _result_; #line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4147 "RESTSupport.c" +#line 4148 "RESTSupport.c" } static gpointer _g_hash_table_ref0 (gpointer self) { #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? g_hash_table_ref (self) : NULL; -#line 4154 "RESTSupport.c" +#line 4155 "RESTSupport.c" } @@ -4177,21 +4178,21 @@ void publishing_rest_support_upload_transaction_set_binary_disposition_table (Pu _g_hash_table_unref0 (self->binary_disposition_table); #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->binary_disposition_table = _tmp1_; -#line 4173 "RESTSupport.c" +#line 4174 "RESTSupport.c" } static void _vala_SoupMultipart_free (SoupMultipart* self) { #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_boxed_free (soup_multipart_get_type (), self); -#line 4180 "RESTSupport.c" +#line 4181 "RESTSupport.c" } static void _vala_SoupBuffer_free (SoupBuffer* self) { #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_boxed_free (soup_buffer_get_type (), self); -#line 4187 "RESTSupport.c" +#line 4188 "RESTSupport.c" } @@ -4275,7 +4276,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR _tmp4_ = request_arguments; #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4__length1 = request_arguments_length1; -#line 4271 "RESTSupport.c" +#line 4272 "RESTSupport.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -4287,14 +4288,14 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR arg_collection_length1 = _tmp4__length1; #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) { -#line 4283 "RESTSupport.c" +#line 4284 "RESTSupport.c" PublishingRESTSupportArgument* _tmp5_ = NULL; PublishingRESTSupportArgument* arg = NULL; #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" arg = _tmp5_; -#line 4290 "RESTSupport.c" +#line 4291 "RESTSupport.c" { SoupMultipart* _tmp6_ = NULL; PublishingRESTSupportArgument* _tmp7_ = NULL; @@ -4315,7 +4316,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_); #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _publishing_rest_support_argument_unref0 (arg); -#line 4311 "RESTSupport.c" +#line 4312 "RESTSupport.c" } } } @@ -4353,7 +4354,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR if (G_UNLIKELY (_inner_error_ != NULL)) { #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 4349 "RESTSupport.c" +#line 4350 "RESTSupport.c" goto __catch2_g_file_error; } #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4368,7 +4369,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR g_clear_error (&_inner_error_); #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4364 "RESTSupport.c" +#line 4365 "RESTSupport.c" } } goto __finally2; @@ -4389,7 +4390,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR _inner_error_ = _tmp19_; #line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_error_free0 (e); -#line 4385 "RESTSupport.c" +#line 4386 "RESTSupport.c" goto __finally2; } __finally2: @@ -4407,7 +4408,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4403 "RESTSupport.c" +#line 4404 "RESTSupport.c" } else { #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (payload); @@ -4421,7 +4422,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR g_clear_error (&_inner_error_); #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4417 "RESTSupport.c" +#line 4418 "RESTSupport.c" } } #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4510,7 +4511,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR cont = _tmp49_; #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 4506 "RESTSupport.c" +#line 4507 "RESTSupport.c" gboolean _tmp50_ = FALSE; SoupMessage* _tmp51_ = NULL; SoupMessageHeaders* _tmp52_ = NULL; @@ -4528,7 +4529,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR if (!_tmp50_) { #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 4524 "RESTSupport.c" +#line 4525 "RESTSupport.c" } #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp51_ = outbound_message; @@ -4558,7 +4559,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR _tmp60_ = gee_map_iterator_next (_tmp59_); #line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" cont = _tmp60_; -#line 4554 "RESTSupport.c" +#line 4555 "RESTSupport.c" } #line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp61_ = outbound_message; @@ -4588,7 +4589,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4584 "RESTSupport.c" +#line 4585 "RESTSupport.c" } else { #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (i); @@ -4608,7 +4609,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR g_clear_error (&_inner_error_); #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 4604 "RESTSupport.c" +#line 4605 "RESTSupport.c" } } #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4623,7 +4624,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR __vala_SoupMultipart_free0 (message_parts); #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 4619 "RESTSupport.c" +#line 4620 "RESTSupport.c" } @@ -4633,10 +4634,10 @@ static void publishing_rest_support_upload_transaction_class_init (PublishingRES #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_upload_transaction_finalize; #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_upload_transaction_real_add_header; + ((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*)(PublishingRESTSupportTransaction*, const gchar*, const gchar*)) publishing_rest_support_upload_transaction_real_add_header; #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_upload_transaction_real_execute; -#line 4632 "RESTSupport.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_rest_support_upload_transaction_real_execute; +#line 4633 "RESTSupport.c" } @@ -4647,7 +4648,7 @@ static void publishing_rest_support_upload_transaction_instance_init (Publishing self->publishable = NULL; #line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->message_headers = NULL; -#line 4643 "RESTSupport.c" +#line 4644 "RESTSupport.c" } @@ -4665,7 +4666,7 @@ static void publishing_rest_support_upload_transaction_finalize (PublishingRESTS _g_object_unref0 (self->message_headers); #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj); -#line 4661 "RESTSupport.c" +#line 4662 "RESTSupport.c" } @@ -4692,14 +4693,14 @@ static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_co self->priv->document = _tmp0_; #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 4688 "RESTSupport.c" +#line 4689 "RESTSupport.c" } static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) { #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc); -#line 4695 "RESTSupport.c" +#line 4696 "RESTSupport.c" } @@ -4717,7 +4718,7 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo result = _tmp1_; #line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4713 "RESTSupport.c" +#line 4714 "RESTSupport.c" } @@ -4739,21 +4740,21 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup _tmp1_ = _tmp0_->children; #line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" doc_node_iter = _tmp1_; -#line 4735 "RESTSupport.c" +#line 4736 "RESTSupport.c" { gboolean _tmp2_ = FALSE; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = TRUE; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 4742 "RESTSupport.c" +#line 4743 "RESTSupport.c" xmlNode* _tmp5_ = NULL; xmlNode* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!_tmp2_) { -#line 4749 "RESTSupport.c" +#line 4750 "RESTSupport.c" xmlNode* _tmp3_ = NULL; xmlNode* _tmp4_ = NULL; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -4762,7 +4763,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup _tmp4_ = _tmp3_->next; #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" doc_node_iter = _tmp4_; -#line 4758 "RESTSupport.c" +#line 4759 "RESTSupport.c" } #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp2_ = FALSE; @@ -4772,7 +4773,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup if (!(_tmp5_ != NULL)) { #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 4768 "RESTSupport.c" +#line 4769 "RESTSupport.c" } #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = doc_node_iter; @@ -4782,7 +4783,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup _tmp8_ = child_name; #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (g_strcmp0 (_tmp7_, _tmp8_) == 0) { -#line 4778 "RESTSupport.c" +#line 4779 "RESTSupport.c" xmlNode* _tmp9_ = NULL; #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ = doc_node_iter; @@ -4790,7 +4791,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup result = _tmp9_; #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4786 "RESTSupport.c" +#line 4787 "RESTSupport.c" } } } @@ -4806,7 +4807,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup g_propagate_error (error, _inner_error_); #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4802 "RESTSupport.c" +#line 4803 "RESTSupport.c" } else { #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4814,7 +4815,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup g_clear_error (&_inner_error_); #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4810 "RESTSupport.c" +#line 4811 "RESTSupport.c" } } @@ -4843,7 +4844,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu _tmp3_ = value_string; #line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp3_ == NULL) { -#line 4839 "RESTSupport.c" +#line 4840 "RESTSupport.c" const gchar* _tmp4_ = NULL; xmlNode* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; @@ -4866,7 +4867,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu _g_free0 (value_string); #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4862 "RESTSupport.c" +#line 4863 "RESTSupport.c" } else { #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (value_string); @@ -4876,14 +4877,14 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu g_clear_error (&_inner_error_); #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4872 "RESTSupport.c" +#line 4873 "RESTSupport.c" } } #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result = value_string; #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 4879 "RESTSupport.c" +#line 4880 "RESTSupport.c" } @@ -4906,7 +4907,7 @@ static gchar* string_chug (const gchar* self) { result = _result_; #line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 4902 "RESTSupport.c" +#line 4903 "RESTSupport.c" } @@ -4929,7 +4930,7 @@ static gchar* string_chomp (const gchar* self) { result = _result_; #line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 4925 "RESTSupport.c" +#line 4926 "RESTSupport.c" } @@ -4970,7 +4971,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str if (_tmp1_ == NULL) { #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = TRUE; -#line 4966 "RESTSupport.c" +#line 4967 "RESTSupport.c" } else { const gchar* _tmp2_ = NULL; gint _tmp3_ = 0; @@ -4983,11 +4984,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _tmp4_ = _tmp3_; #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _tmp4_ == 0; -#line 4979 "RESTSupport.c" +#line 4980 "RESTSupport.c" } #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp0_) { -#line 4983 "RESTSupport.c" +#line 4984 "RESTSupport.c" GError* _tmp5_ = NULL; #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string"); @@ -4999,7 +5000,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_propagate_error (error, _inner_error_); #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 4995 "RESTSupport.c" +#line 4996 "RESTSupport.c" } else { #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5007,7 +5008,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5003 "RESTSupport.c" +#line 5004 "RESTSupport.c" } } #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5032,7 +5033,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str if (_tmp13_) { #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = TRUE; -#line 5028 "RESTSupport.c" +#line 5029 "RESTSupport.c" } else { const gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; @@ -5058,11 +5059,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _g_free0 (_tmp18_); #line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (_tmp16_); -#line 5054 "RESTSupport.c" +#line 5055 "RESTSupport.c" } #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp6_) { -#line 5058 "RESTSupport.c" +#line 5059 "RESTSupport.c" GError* _tmp20_ = NULL; #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document"); @@ -5074,7 +5075,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_propagate_error (error, _inner_error_); #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5070 "RESTSupport.c" +#line 5071 "RESTSupport.c" } else { #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5082,7 +5083,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5078 "RESTSupport.c" +#line 5079 "RESTSupport.c" } } #line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5101,7 +5102,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _tmp26_ = doc; #line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp26_ == NULL) { -#line 5097 "RESTSupport.c" +#line 5098 "RESTSupport.c" GError* _tmp27_ = NULL; #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document"); @@ -5113,7 +5114,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_propagate_error (error, _inner_error_); #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5109 "RESTSupport.c" +#line 5110 "RESTSupport.c" } else { #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5121,7 +5122,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5117 "RESTSupport.c" +#line 5118 "RESTSupport.c" } } #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5130,7 +5131,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _tmp29_ = _tmp28_->children; #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp29_ == NULL) { -#line 5126 "RESTSupport.c" +#line 5127 "RESTSupport.c" GError* _tmp30_ = NULL; #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document"); @@ -5142,7 +5143,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_propagate_error (error, _inner_error_); #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5138 "RESTSupport.c" +#line 5139 "RESTSupport.c" } else { #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5150,7 +5151,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5146 "RESTSupport.c" +#line 5147 "RESTSupport.c" } } #line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5173,7 +5174,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _tmp36_ = _result_; #line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp36_ != NULL) { -#line 5169 "RESTSupport.c" +#line 5170 "RESTSupport.c" const gchar* _tmp37_ = NULL; GError* _tmp38_ = NULL; #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5192,7 +5193,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _publishing_rest_support_xml_document_unref0 (rest_doc); #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5188 "RESTSupport.c" +#line 5189 "RESTSupport.c" } else { #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (_result_); @@ -5204,7 +5205,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str g_clear_error (&_inner_error_); #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5200 "RESTSupport.c" +#line 5201 "RESTSupport.c" } } #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5213,14 +5214,14 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str _g_free0 (_result_); #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 5209 "RESTSupport.c" +#line 5210 "RESTSupport.c" } static void publishing_rest_support_value_xml_document_init (GValue* value) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 5216 "RESTSupport.c" +#line 5217 "RESTSupport.c" } @@ -5229,7 +5230,7 @@ static void publishing_rest_support_value_xml_document_free_value (GValue* value if (value->data[0].v_pointer) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_xml_document_unref (value->data[0].v_pointer); -#line 5225 "RESTSupport.c" +#line 5226 "RESTSupport.c" } } @@ -5239,11 +5240,11 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue* if (src_value->data[0].v_pointer) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer); -#line 5235 "RESTSupport.c" +#line 5236 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 5239 "RESTSupport.c" +#line 5240 "RESTSupport.c" } } @@ -5251,37 +5252,37 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue* static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 5247 "RESTSupport.c" +#line 5248 "RESTSupport.c" } static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 5254 "RESTSupport.c" +#line 5255 "RESTSupport.c" PublishingRESTSupportXmlDocument* object; object = collect_values[0].v_pointer; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5261 "RESTSupport.c" +#line 5262 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 5265 "RESTSupport.c" +#line 5266 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object); -#line 5269 "RESTSupport.c" +#line 5270 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 5273 "RESTSupport.c" +#line 5274 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5277 "RESTSupport.c" +#line 5278 "RESTSupport.c" } @@ -5292,25 +5293,25 @@ static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GVal if (!object_p) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 5288 "RESTSupport.c" +#line 5289 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 5294 "RESTSupport.c" +#line 5295 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 5298 "RESTSupport.c" +#line 5299 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer); -#line 5302 "RESTSupport.c" +#line 5303 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 5306 "RESTSupport.c" +#line 5307 "RESTSupport.c" } @@ -5324,7 +5325,7 @@ GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 5320 "RESTSupport.c" +#line 5321 "RESTSupport.c" } @@ -5333,7 +5334,7 @@ gpointer publishing_rest_support_value_get_xml_document (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 5329 "RESTSupport.c" +#line 5330 "RESTSupport.c" } @@ -5353,17 +5354,17 @@ void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_o value->data[0].v_pointer = v_object; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_xml_document_ref (value->data[0].v_pointer); -#line 5349 "RESTSupport.c" +#line 5350 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 5353 "RESTSupport.c" +#line 5354 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_xml_document_unref (old); -#line 5359 "RESTSupport.c" +#line 5360 "RESTSupport.c" } } @@ -5382,17 +5383,17 @@ void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 5378 "RESTSupport.c" +#line 5379 "RESTSupport.c" } else { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 5382 "RESTSupport.c" +#line 5383 "RESTSupport.c" } #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_xml_document_unref (old); -#line 5388 "RESTSupport.c" +#line 5389 "RESTSupport.c" } } @@ -5404,7 +5405,7 @@ static void publishing_rest_support_xml_document_class_init (PublishingRESTSuppo ((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize; #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate)); -#line 5400 "RESTSupport.c" +#line 5401 "RESTSupport.c" } @@ -5413,7 +5414,7 @@ static void publishing_rest_support_xml_document_instance_init (PublishingRESTSu self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 5409 "RESTSupport.c" +#line 5410 "RESTSupport.c" } @@ -5428,7 +5429,7 @@ static void publishing_rest_support_xml_document_finalize (PublishingRESTSupport _tmp0_ = self->priv->document; #line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" xmlFreeDoc (_tmp0_); -#line 5424 "RESTSupport.c" +#line 5425 "RESTSupport.c" } @@ -5453,7 +5454,7 @@ gpointer publishing_rest_support_xml_document_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 5449 "RESTSupport.c" +#line 5450 "RESTSupport.c" } @@ -5466,7 +5467,7 @@ void publishing_rest_support_xml_document_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self); #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 5462 "RESTSupport.c" +#line 5463 "RESTSupport.c" } } @@ -5495,7 +5496,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { current_char = _tmp2_; #line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 5491 "RESTSupport.c" +#line 5492 "RESTSupport.c" gint current_char_value = 0; const gchar* _tmp3_ = NULL; gunichar _tmp4_ = 0U; @@ -5519,55 +5520,55 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { if (_tmp5_ < 1) { #line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 5515 "RESTSupport.c" +#line 5516 "RESTSupport.c" } #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ = current_char_value; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp9_ < 128) { -#line 5521 "RESTSupport.c" +#line 5522 "RESTSupport.c" gint _tmp10_ = 0; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp10_ = current_char_value; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ = _tmp10_ != ((gint) '&'); -#line 5527 "RESTSupport.c" +#line 5528 "RESTSupport.c" } else { #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ = FALSE; -#line 5531 "RESTSupport.c" +#line 5532 "RESTSupport.c" } #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp8_) { -#line 5535 "RESTSupport.c" +#line 5536 "RESTSupport.c" gint _tmp11_ = 0; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp11_ = current_char_value; #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp7_ = _tmp11_ != ((gint) '<'); -#line 5541 "RESTSupport.c" +#line 5542 "RESTSupport.c" } else { #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp7_ = FALSE; -#line 5545 "RESTSupport.c" +#line 5546 "RESTSupport.c" } #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp7_) { -#line 5549 "RESTSupport.c" +#line 5550 "RESTSupport.c" gint _tmp12_ = 0; #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp12_ = current_char_value; #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = _tmp12_ != ((gint) '>'); -#line 5555 "RESTSupport.c" +#line 5556 "RESTSupport.c" } else { #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = FALSE; -#line 5559 "RESTSupport.c" +#line 5560 "RESTSupport.c" } #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp6_) { -#line 5563 "RESTSupport.c" +#line 5564 "RESTSupport.c" GString* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; gunichar _tmp15_ = 0U; @@ -5579,7 +5580,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { _tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1); #line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_string_append_unichar (_tmp13_, _tmp15_); -#line 5575 "RESTSupport.c" +#line 5576 "RESTSupport.c" } else { GString* _tmp16_ = NULL; gint _tmp17_ = 0; @@ -5597,7 +5598,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { g_string_append (_tmp16_, _tmp19_); #line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_free0 (_tmp19_); -#line 5593 "RESTSupport.c" +#line 5594 "RESTSupport.c" } #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp20_ = current_char; @@ -5609,7 +5610,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { _g_free0 (current_char); #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" current_char = _tmp22_; -#line 5605 "RESTSupport.c" +#line 5606 "RESTSupport.c" } #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp23_ = encoded_str_builder; @@ -5625,7 +5626,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) { _g_string_free0 (encoded_str_builder); #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 5621 "RESTSupport.c" +#line 5622 "RESTSupport.c" } @@ -5636,17 +5637,17 @@ static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** result = g_new0 (SpitPublishingPublishable*, length + 1); #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (i = 0; i < length; i++) { -#line 5632 "RESTSupport.c" +#line 5633 "RESTSupport.c" SpitPublishingPublishable* _tmp0_ = NULL; #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" result[i] = _tmp0_; -#line 5638 "RESTSupport.c" +#line 5639 "RESTSupport.c" } #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 5642 "RESTSupport.c" +#line 5643 "RESTSupport.c" } @@ -5688,14 +5689,14 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const self->priv->session = _tmp3_; #line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 5684 "RESTSupport.c" +#line 5685 "RESTSupport.c" } static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) { #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes); -#line 5691 "RESTSupport.c" +#line 5692 "RESTSupport.c" } @@ -5715,7 +5716,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp0_ = self->priv->publishables; #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp0__length1 = self->priv->publishables_length1; -#line 5711 "RESTSupport.c" +#line 5712 "RESTSupport.c" { SpitPublishingPublishable** publishable_collection = NULL; gint publishable_collection_length1 = 0; @@ -5727,14 +5728,14 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup publishable_collection_length1 = _tmp0__length1; #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) { -#line 5723 "RESTSupport.c" +#line 5724 "RESTSupport.c" SpitPublishingPublishable* _tmp1_ = NULL; SpitPublishingPublishable* publishable = NULL; #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]); #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishable = _tmp1_; -#line 5730 "RESTSupport.c" +#line 5731 "RESTSupport.c" { GFile* file = NULL; SpitPublishingPublishable* _tmp2_ = NULL; @@ -5767,7 +5768,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp4_ = file; #line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp4_ == NULL) { -#line 5763 "RESTSupport.c" +#line 5764 "RESTSupport.c" gint _tmp5_ = 0; #line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp5_ = self->priv->current_file; @@ -5779,7 +5780,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _g_object_unref0 (publishable); #line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" continue; -#line 5775 "RESTSupport.c" +#line 5776 "RESTSupport.c" } #line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp6_ = self->priv->current_file; @@ -5795,7 +5796,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp8__target = self->priv->status_updated_target; #line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp8_ != NULL) { -#line 5791 "RESTSupport.c" +#line 5792 "RESTSupport.c" SpitPublishingProgressCallback _tmp9_ = NULL; void* _tmp9__target = NULL; gint _tmp10_ = 0; @@ -5810,7 +5811,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp11_ = fraction_complete; #line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target); -#line 5806 "RESTSupport.c" +#line 5807 "RESTSupport.c" } #line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp12_ = self->priv->publishables; @@ -5828,7 +5829,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp16_ = txn; #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self); -#line 5824 "RESTSupport.c" +#line 5825 "RESTSupport.c" { PublishingRESTSupportTransaction* _tmp17_ = NULL; #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5839,7 +5840,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup if (G_UNLIKELY (_inner_error_ != NULL)) { #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5835 "RESTSupport.c" +#line 5836 "RESTSupport.c" goto __catch3_spit_publishing_publishing_error; } #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5854,7 +5855,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup g_clear_error (&_inner_error_); #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 5850 "RESTSupport.c" +#line 5851 "RESTSupport.c" } } goto __finally3; @@ -5874,7 +5875,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup stop = TRUE; #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_error_free0 (err); -#line 5870 "RESTSupport.c" +#line 5871 "RESTSupport.c" } __finally3: #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -5891,7 +5892,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup g_clear_error (&_inner_error_); #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 5887 "RESTSupport.c" +#line 5888 "RESTSupport.c" } #line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp19_ = txn; @@ -5911,7 +5912,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _g_object_unref0 (publishable); #line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 5907 "RESTSupport.c" +#line 5908 "RESTSupport.c" } #line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp22_ = self->priv->current_file; @@ -5923,7 +5924,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _g_object_unref0 (file); #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_object_unref0 (publishable); -#line 5919 "RESTSupport.c" +#line 5920 "RESTSupport.c" } } } @@ -5931,13 +5932,13 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup _tmp23_ = stop; #line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!_tmp23_) { -#line 5927 "RESTSupport.c" +#line 5928 "RESTSupport.c" gint _tmp24_ = 0; #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp24_ = self->priv->current_file; #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_emit_by_name (self, "upload-complete", _tmp24_); -#line 5933 "RESTSupport.c" +#line 5934 "RESTSupport.c" } } @@ -5986,7 +5987,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish _tmp7__target = self->priv->status_updated_target; #line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (_tmp7_ != NULL) { -#line 5982 "RESTSupport.c" +#line 5983 "RESTSupport.c" SpitPublishingProgressCallback _tmp8_ = NULL; void* _tmp8__target = NULL; gint _tmp9_ = 0; @@ -6001,7 +6002,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish _tmp10_ = fraction_complete; #line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target); -#line 5997 "RESTSupport.c" +#line 5998 "RESTSupport.c" } } @@ -6020,7 +6021,7 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session result = _tmp1_; #line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6016 "RESTSupport.c" +#line 6017 "RESTSupport.c" } @@ -6047,7 +6048,7 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu result = _tmp3_; #line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6043 "RESTSupport.c" +#line 6044 "RESTSupport.c" } @@ -6056,7 +6057,7 @@ static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_ g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6052 "RESTSupport.c" +#line 6053 "RESTSupport.c" } @@ -6065,7 +6066,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL); #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable); -#line 6061 "RESTSupport.c" +#line 6062 "RESTSupport.c" } @@ -6092,7 +6093,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp if (_tmp1__length1 > 0) { #line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_send_files (self); -#line 6088 "RESTSupport.c" +#line 6089 "RESTSupport.c" } } @@ -6100,7 +6101,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp static void publishing_rest_support_value_batch_uploader_init (GValue* value) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 6096 "RESTSupport.c" +#line 6097 "RESTSupport.c" } @@ -6109,7 +6110,7 @@ static void publishing_rest_support_value_batch_uploader_free_value (GValue* val if (value->data[0].v_pointer) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer); -#line 6105 "RESTSupport.c" +#line 6106 "RESTSupport.c" } } @@ -6119,11 +6120,11 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu if (src_value->data[0].v_pointer) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer); -#line 6115 "RESTSupport.c" +#line 6116 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" dest_value->data[0].v_pointer = NULL; -#line 6119 "RESTSupport.c" +#line 6120 "RESTSupport.c" } } @@ -6131,37 +6132,37 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 6127 "RESTSupport.c" +#line 6128 "RESTSupport.c" } static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (collect_values[0].v_pointer) { -#line 6134 "RESTSupport.c" +#line 6135 "RESTSupport.c" PublishingRESTSupportBatchUploader* object; object = collect_values[0].v_pointer; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (object->parent_instance.g_class == NULL) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6141 "RESTSupport.c" +#line 6142 "RESTSupport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 6145 "RESTSupport.c" +#line 6146 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object); -#line 6149 "RESTSupport.c" +#line 6150 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 6153 "RESTSupport.c" +#line 6154 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6157 "RESTSupport.c" +#line 6158 "RESTSupport.c" } @@ -6172,25 +6173,25 @@ static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GV if (!object_p) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6168 "RESTSupport.c" +#line 6169 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!value->data[0].v_pointer) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = NULL; -#line 6174 "RESTSupport.c" +#line 6175 "RESTSupport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = value->data[0].v_pointer; -#line 6178 "RESTSupport.c" +#line 6179 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" *object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer); -#line 6182 "RESTSupport.c" +#line 6183 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6186 "RESTSupport.c" +#line 6187 "RESTSupport.c" } @@ -6204,7 +6205,7 @@ GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name G_PARAM_SPEC (spec)->value_type = object_type; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return G_PARAM_SPEC (spec); -#line 6200 "RESTSupport.c" +#line 6201 "RESTSupport.c" } @@ -6213,7 +6214,7 @@ gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return value->data[0].v_pointer; -#line 6209 "RESTSupport.c" +#line 6210 "RESTSupport.c" } @@ -6233,17 +6234,17 @@ void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v value->data[0].v_pointer = v_object; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer); -#line 6229 "RESTSupport.c" +#line 6230 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 6233 "RESTSupport.c" +#line 6234 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_unref (old); -#line 6239 "RESTSupport.c" +#line 6240 "RESTSupport.c" } } @@ -6262,17 +6263,17 @@ void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = v_object; -#line 6258 "RESTSupport.c" +#line 6259 "RESTSupport.c" } else { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" value->data[0].v_pointer = NULL; -#line 6262 "RESTSupport.c" +#line 6263 "RESTSupport.c" } #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (old) { #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_batch_uploader_unref (old); -#line 6268 "RESTSupport.c" +#line 6269 "RESTSupport.c" } } @@ -6285,12 +6286,12 @@ static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSup #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportBatchUploaderPrivate)); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_rest_support_batch_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_rest_support_batch_uploader_real_create_transaction; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_new ("upload_complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_signal_new ("upload_error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); -#line 6286 "RESTSupport.c" +#line 6287 "RESTSupport.c" } @@ -6311,7 +6312,7 @@ static void publishing_rest_support_batch_uploader_instance_init (PublishingREST self->priv->status_updated = NULL; #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->ref_count = 1; -#line 6307 "RESTSupport.c" +#line 6308 "RESTSupport.c" } @@ -6325,7 +6326,7 @@ static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSuppo self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL); #line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _publishing_rest_support_session_unref0 (self->priv->session); -#line 6321 "RESTSupport.c" +#line 6322 "RESTSupport.c" } @@ -6350,7 +6351,7 @@ gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return instance; -#line 6346 "RESTSupport.c" +#line 6347 "RESTSupport.c" } @@ -6363,7 +6364,7 @@ void publishing_rest_support_batch_uploader_unref (gpointer instance) { PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self); #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6359 "RESTSupport.c" +#line 6360 "RESTSupport.c" } } @@ -6382,7 +6383,7 @@ static gunichar string_get_char (const gchar* self, glong index) { result = _tmp1_; #line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 6378 "RESTSupport.c" +#line 6379 "RESTSupport.c" } @@ -6408,7 +6409,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { _tmp2_ = g_string_new (""); #line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" b = _tmp2_; -#line 6404 "RESTSupport.c" +#line 6405 "RESTSupport.c" { const gchar* u = NULL; const gchar* _tmp3_ = NULL; @@ -6416,14 +6417,14 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { _tmp3_ = t; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" u = _tmp3_; -#line 6412 "RESTSupport.c" +#line 6413 "RESTSupport.c" { gboolean _tmp4_ = FALSE; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = TRUE; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" while (TRUE) { -#line 6419 "RESTSupport.c" +#line 6420 "RESTSupport.c" const gchar* _tmp7_ = NULL; gunichar _tmp8_ = 0U; gunichar c = 0U; @@ -6432,7 +6433,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { gunichar _tmp11_ = 0U; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (!_tmp4_) { -#line 6428 "RESTSupport.c" +#line 6429 "RESTSupport.c" const gchar* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6441,7 +6442,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { _tmp6_ = g_utf8_next_char (_tmp5_); #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" u = _tmp6_; -#line 6437 "RESTSupport.c" +#line 6438 "RESTSupport.c" } #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp4_ = FALSE; @@ -6453,7 +6454,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { if (!(_tmp8_ != ((gunichar) 0))) { #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" break; -#line 6449 "RESTSupport.c" +#line 6450 "RESTSupport.c" } #line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _tmp9_ = u; @@ -6465,7 +6466,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { _tmp11_ = c; #line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" if (((gint) _tmp11_) < 128) { -#line 6461 "RESTSupport.c" +#line 6462 "RESTSupport.c" GString* _tmp12_ = NULL; gunichar _tmp13_ = 0U; #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" @@ -6474,7 +6475,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { _tmp13_ = c; #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_string_append_unichar (_tmp12_, _tmp13_); -#line 6470 "RESTSupport.c" +#line 6471 "RESTSupport.c" } } } @@ -6493,7 +6494,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) { _g_free0 (t); #line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6489 "RESTSupport.c" +#line 6490 "RESTSupport.c" } @@ -6502,7 +6503,7 @@ static gchar* publishing_rest_support_google_session_real_get_user_name (Publish g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6498 "RESTSupport.c" +#line 6499 "RESTSupport.c" } @@ -6511,7 +6512,7 @@ gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSuppo g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL); #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self); -#line 6507 "RESTSupport.c" +#line 6508 "RESTSupport.c" } @@ -6520,7 +6521,7 @@ static gchar* publishing_rest_support_google_session_real_get_access_token (Publ g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6516 "RESTSupport.c" +#line 6517 "RESTSupport.c" } @@ -6529,7 +6530,7 @@ gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSu g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL); #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self); -#line 6525 "RESTSupport.c" +#line 6526 "RESTSupport.c" } @@ -6538,7 +6539,7 @@ static void publishing_rest_support_google_session_real_deauthenticate (Publishi g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6534 "RESTSupport.c" +#line 6535 "RESTSupport.c" } @@ -6547,7 +6548,7 @@ void publishing_rest_support_google_session_deauthenticate (PublishingRESTSuppor g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self)); #line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self); -#line 6543 "RESTSupport.c" +#line 6544 "RESTSupport.c" } @@ -6557,7 +6558,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_const self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL); #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 6553 "RESTSupport.c" +#line 6554 "RESTSupport.c" } @@ -6565,12 +6566,12 @@ static void publishing_rest_support_google_session_class_init (PublishingRESTSup #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_google_session_parent_class = g_type_class_peek_parent (klass); #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = publishing_rest_support_google_session_real_get_user_name; + ((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_session_real_get_user_name; #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = publishing_rest_support_google_session_real_get_access_token; + ((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_session_real_get_access_token; #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_session_real_deauthenticate; -#line 6566 "RESTSupport.c" + ((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_session_real_deauthenticate; +#line 6567 "RESTSupport.c" } @@ -6593,7 +6594,7 @@ GType publishing_rest_support_google_session_get_type (void) { static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) { #line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_google_publisher_on_authenticator_authenticated ((PublishingRESTSupportGooglePublisher*) self); -#line 6589 "RESTSupport.c" +#line 6590 "RESTSupport.c" } @@ -6648,7 +6649,7 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c g_signal_connect_object (_tmp6_, "authenticated", (GCallback) _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0); #line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 6644 "RESTSupport.c" +#line 6645 "RESTSupport.c" } @@ -6657,7 +6658,7 @@ static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_rea g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_get_authenticator'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return NULL; -#line 6653 "RESTSupport.c" +#line 6654 "RESTSupport.c" } @@ -6666,7 +6667,7 @@ SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authen g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL); #line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->get_authenticator (self); -#line 6662 "RESTSupport.c" +#line 6663 "RESTSupport.c" } @@ -6681,7 +6682,7 @@ SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (Pub result = _tmp0_; #line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6677 "RESTSupport.c" +#line 6678 "RESTSupport.c" } @@ -6699,7 +6700,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get result = _tmp1_; #line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6695 "RESTSupport.c" +#line 6696 "RESTSupport.c" } @@ -6708,7 +6709,7 @@ static void publishing_rest_support_google_publisher_real_on_login_flow_complete g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_on_login_flow_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6704 "RESTSupport.c" +#line 6705 "RESTSupport.c" } @@ -6717,7 +6718,7 @@ void publishing_rest_support_google_publisher_on_login_flow_complete (Publishing g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self)); #line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self); -#line 6713 "RESTSupport.c" +#line 6714 "RESTSupport.c" } @@ -6726,7 +6727,7 @@ static void publishing_rest_support_google_publisher_real_do_logout (PublishingR g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_do_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6722 "RESTSupport.c" +#line 6723 "RESTSupport.c" } @@ -6735,16 +6736,17 @@ void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGo g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self)); #line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self); -#line 6731 "RESTSupport.c" +#line 6732 "RESTSupport.c" } static gboolean publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self) { + gboolean _tmp0_ = FALSE; #line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_is_running'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - return FALSE; -#line 6740 "RESTSupport.c" + return _tmp0_; +#line 6742 "RESTSupport.c" } @@ -6753,7 +6755,7 @@ gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupp g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE); #line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self); -#line 6749 "RESTSupport.c" +#line 6751 "RESTSupport.c" } @@ -6762,7 +6764,7 @@ static void publishing_rest_support_google_publisher_real_start (PublishingRESTS g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6758 "RESTSupport.c" +#line 6760 "RESTSupport.c" } @@ -6771,7 +6773,7 @@ void publishing_rest_support_google_publisher_start (PublishingRESTSupportGoogle g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self)); #line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self); -#line 6767 "RESTSupport.c" +#line 6769 "RESTSupport.c" } @@ -6780,7 +6782,7 @@ static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSu g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return; -#line 6776 "RESTSupport.c" +#line 6778 "RESTSupport.c" } @@ -6789,7 +6791,7 @@ void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGoogleP g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self)); #line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self); -#line 6785 "RESTSupport.c" +#line 6787 "RESTSupport.c" } @@ -6808,14 +6810,14 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_ result = _tmp1_; #line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6804 "RESTSupport.c" +#line 6806 "RESTSupport.c" } static gpointer _g_variant_ref0 (gpointer self) { #line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self ? g_variant_ref (self) : NULL; -#line 6811 "RESTSupport.c" +#line 6813 "RESTSupport.c" } @@ -6928,7 +6930,7 @@ static void publishing_rest_support_google_publisher_on_authenticator_authentica _g_variant_unref0 (refresh_token); #line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" _g_hash_table_unref0 (params); -#line 6924 "RESTSupport.c" +#line 6926 "RESTSupport.c" } @@ -6950,14 +6952,14 @@ static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_su self->refresh_token = NULL; #line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 6946 "RESTSupport.c" +#line 6948 "RESTSupport.c" } static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) { #line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL); -#line 6953 "RESTSupport.c" +#line 6955 "RESTSupport.c" } @@ -6973,7 +6975,7 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea result = _tmp0_ != NULL; #line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6969 "RESTSupport.c" +#line 6971 "RESTSupport.c" } @@ -6997,7 +6999,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_ result = _tmp2_; #line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 6993 "RESTSupport.c" +#line 6995 "RESTSupport.c" } @@ -7021,7 +7023,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_ result = _tmp2_; #line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return result; -#line 7017 "RESTSupport.c" +#line 7019 "RESTSupport.c" } @@ -7041,7 +7043,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_real_de _g_free0 (self->refresh_token); #line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->refresh_token = NULL; -#line 7037 "RESTSupport.c" +#line 7039 "RESTSupport.c" } @@ -7051,14 +7053,14 @@ static void publishing_rest_support_google_publisher_google_session_impl_class_i #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" ((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_google_publisher_google_session_impl_finalize; #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated; #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = publishing_rest_support_google_publisher_google_session_impl_real_get_user_name; + ((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_publisher_google_session_impl_real_get_user_name; #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = publishing_rest_support_google_publisher_google_session_impl_real_get_access_token; + ((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_publisher_google_session_impl_real_get_access_token; #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate; -#line 7054 "RESTSupport.c" + ((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate; +#line 7056 "RESTSupport.c" } @@ -7078,7 +7080,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_finaliz _g_free0 (self->refresh_token); #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj); -#line 7074 "RESTSupport.c" +#line 7076 "RESTSupport.c" } @@ -7113,14 +7115,14 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_ self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_); #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 7109 "RESTSupport.c" +#line 7111 "RESTSupport.c" } static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) { #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method); -#line 7116 "RESTSupport.c" +#line 7118 "RESTSupport.c" } @@ -7172,21 +7174,21 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su _g_free0 (_tmp7_); #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return self; -#line 7168 "RESTSupport.c" +#line 7170 "RESTSupport.c" } PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) { #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method); -#line 7175 "RESTSupport.c" +#line 7177 "RESTSupport.c" } static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) { #line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass); -#line 7182 "RESTSupport.c" +#line 7184 "RESTSupport.c" } @@ -7212,20 +7214,20 @@ static void publishing_rest_support_google_publisher_class_init (PublishingRESTS #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherPrivate)); #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = publishing_rest_support_google_publisher_real_get_authenticator; + ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_get_authenticator; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_rest_support_google_publisher_real_on_login_flow_complete; + ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_on_login_flow_complete; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_rest_support_google_publisher_real_do_logout; + ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_do_logout; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_rest_support_google_publisher_real_is_running; + ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_is_running; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_rest_support_google_publisher_real_start; + ((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_start; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_rest_support_google_publisher_real_stop; + ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_stop; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize; -#line 7221 "RESTSupport.c" +#line 7223 "RESTSupport.c" } @@ -7240,14 +7242,14 @@ static void publishing_rest_support_google_publisher_spit_publishing_publisher_i iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_stop; #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_real_get_service; -#line 7236 "RESTSupport.c" +#line 7238 "RESTSupport.c" } static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) { #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self); -#line 7243 "RESTSupport.c" +#line 7245 "RESTSupport.c" } @@ -7263,7 +7265,7 @@ static void publishing_rest_support_google_publisher_finalize (GObject* obj) { _g_object_unref0 (self->priv->authenticator); #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala" G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj); -#line 7259 "RESTSupport.c" +#line 7261 "RESTSupport.c" } diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c index b3ddcbb..d3b92c0 100644 --- a/plugins/common/Resources.c +++ b/plugins/common/Resources.c @@ -1,4 +1,4 @@ -/* Resources.c generated by valac 0.34.4, the Vala compiler +/* Resources.c generated by valac 0.34.7, the Vala compiler * generated from Resources.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c index 1490045..329f57c 100644 --- a/plugins/common/WebAuthenticationPane.c +++ b/plugins/common/WebAuthenticationPane.c @@ -1,4 +1,4 @@ -/* WebAuthenticationPane.c generated by valac 0.34.4, the Vala compiler +/* WebAuthenticationPane.c generated by valac 0.34.7, the Vala compiler * generated from WebAuthenticationPane.vala, do not modify */ /* Copyright 2016 Jens Georg <mail@jensge.org> @@ -427,9 +427,9 @@ static void shotwell_plugins_common_web_authentication_pane_class_init (Shotwell #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonWebAuthenticationPanePrivate)); #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - ((GObjectClass *) klass)->constructed = shotwell_plugins_common_web_authentication_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) shotwell_plugins_common_web_authentication_pane_real_constructed; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" - ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = shotwell_plugins_common_web_authentication_pane_real_on_page_load; + ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) shotwell_plugins_common_web_authentication_pane_real_on_page_load; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_web_authentication_pane_get_property; #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala" diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c index bc423d1..9dd325a 100644 --- a/plugins/shotwell-data-imports/FSpotDatabase.c +++ b/plugins/shotwell-data-imports/FSpotDatabase.c @@ -1,4 +1,4 @@ -/* FSpotDatabase.c generated by valac 0.34.4, the Vala compiler +/* FSpotDatabase.c generated by valac 0.34.7, the Vala compiler * generated from FSpotDatabase.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c index eee5e75..ed13500 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseBehavior.c generated by valac 0.34.4, the Vala compiler +/* FSpotDatabaseBehavior.c generated by valac 0.34.7, the Vala compiler * generated from FSpotDatabaseBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -902,13 +902,13 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) { DataImportsFSpotDbFSpotBehaviorEntry* _tmp137_ = NULL; GeeMap* _tmp138_ = NULL; #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" _g_object_unref0 (data_imports_fspot_db_fspot_database_behavior_behavior_map); #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" data_imports_fspot_db_fspot_database_behavior_behavior_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" - _tmp1_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" photos_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList); #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1126,7 +1126,7 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) { #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" gee_map_set (_tmp58_, DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME, photos_list); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" - _tmp59_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); + _tmp59_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" tags_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_LIST, GeeList); #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1164,7 +1164,7 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" gee_map_set (_tmp68_, DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_TABLE_NAME, tags_list); #line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" - _tmp69_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); + _tmp69_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); #line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" photo_tags_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_LIST, GeeList); #line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1202,7 +1202,7 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) { #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" gee_map_set (_tmp78_, DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_TABLE_NAME, photo_tags_list); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" - _tmp79_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); + _tmp79_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" photo_versions_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GEE_TYPE_LIST, GeeList); #line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" @@ -1360,7 +1360,7 @@ void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) { #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" gee_map_set (_tmp120_, DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME, photo_versions_list); #line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" - _tmp121_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); + _tmp121_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL); #line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" rolls_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GEE_TYPE_LIST, GeeList); #line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala" diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.c b/plugins/shotwell-data-imports/FSpotDatabaseTable.c index ffbd887..1583846 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseTable.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotDatabaseTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotDatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -752,10 +752,10 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS sqlite3_stmt* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; - sqlite3_stmt* _tmp13_ = NULL; - gint _tmp14_ = 0; - gboolean _tmp15_ = FALSE; + sqlite3_stmt* _tmp15_ = NULL; gint _tmp16_ = 0; + gboolean _tmp17_ = FALSE; + gint _tmp18_ = 0; GError * _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), 0); @@ -808,6 +808,8 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS if (G_UNLIKELY (_inner_error_ != NULL)) { #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { +#line 812 "FSpotDatabaseTable.c" + gint _tmp13_ = 0; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_propagate_error (error, _inner_error_); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -815,9 +817,10 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _g_free0 (column_list); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - return 0; -#line 820 "FSpotDatabaseTable.c" + return _tmp13_; +#line 822 "FSpotDatabaseTable.c" } else { + gint _tmp14_ = 0; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _g_free0 (sql); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -827,59 +830,61 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_clear_error (&_inner_error_); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - return 0; -#line 832 "FSpotDatabaseTable.c" + return _tmp14_; +#line 835 "FSpotDatabaseTable.c" } } } #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp13_ = _vala_stmt; + _tmp15_ = _vala_stmt; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp14_ = sqlite3_step (_tmp13_); + _tmp16_ = sqlite3_step (_tmp15_); #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - res = _tmp14_; + res = _tmp16_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp16_ = res; + _tmp18_ = res; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - if (_tmp16_ != SQLITE_ROW) { -#line 846 "FSpotDatabaseTable.c" - gint _tmp17_ = 0; + if (_tmp18_ != SQLITE_ROW) { +#line 849 "FSpotDatabaseTable.c" + gint _tmp19_ = 0; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp17_ = res; + _tmp19_ = res; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp15_ = _tmp17_ != SQLITE_DONE; -#line 852 "FSpotDatabaseTable.c" + _tmp17_ = _tmp19_ != SQLITE_DONE; +#line 855 "FSpotDatabaseTable.c" } else { #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp15_ = FALSE; -#line 856 "FSpotDatabaseTable.c" + _tmp17_ = FALSE; +#line 859 "FSpotDatabaseTable.c" } #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - if (_tmp15_) { -#line 860 "FSpotDatabaseTable.c" - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gint _tmp22_ = 0; + if (_tmp17_) { +#line 863 "FSpotDatabaseTable.c" + const gchar* _tmp20_ = NULL; + const gchar* _tmp21_ = NULL; + gchar* _tmp22_ = NULL; + gchar* _tmp23_ = NULL; + gint _tmp24_ = 0; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name; + _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp19_ = column_list; + _tmp21_ = column_list; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp20_ = g_strdup_printf ("select_all %s %s", _tmp18_, _tmp19_); + _tmp22_ = g_strdup_printf ("select_all %s %s", _tmp20_, _tmp21_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp21_ = _tmp20_; + _tmp23_ = _tmp22_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _tmp22_ = res; + _tmp24_ = res; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - importable_database_table_throw_error (_tmp21_, _tmp22_, &_inner_error_); + importable_database_table_throw_error (_tmp23_, _tmp24_, &_inner_error_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp23_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { +#line 887 "FSpotDatabaseTable.c" + gint _tmp25_ = 0; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_propagate_error (error, _inner_error_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -887,9 +892,10 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _g_free0 (column_list); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - return 0; -#line 892 "FSpotDatabaseTable.c" + return _tmp25_; +#line 897 "FSpotDatabaseTable.c" } else { + gint _tmp26_ = 0; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _g_free0 (sql); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" @@ -899,8 +905,8 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_clear_error (&_inner_error_); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" - return 0; -#line 904 "FSpotDatabaseTable.c" + return _tmp26_; +#line 910 "FSpotDatabaseTable.c" } } } @@ -914,15 +920,15 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS if (stmt) { #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" *stmt = _vala_stmt; -#line 918 "FSpotDatabaseTable.c" +#line 924 "FSpotDatabaseTable.c" } else { #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); -#line 922 "FSpotDatabaseTable.c" +#line 928 "FSpotDatabaseTable.c" } #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" return result; -#line 926 "FSpotDatabaseTable.c" +#line 932 "FSpotDatabaseTable.c" } @@ -933,14 +939,14 @@ static void data_imports_fspot_db_fspot_database_table_class_init (DataImportsFS ((ImportableDatabaseTableClass *) klass)->finalize = data_imports_fspot_db_fspot_database_table_finalize; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" g_type_class_add_private (klass, sizeof (DataImportsFSpotDbFSpotDatabaseTablePrivate)); -#line 937 "FSpotDatabaseTable.c" +#line 943 "FSpotDatabaseTable.c" } static void data_imports_fspot_db_fspot_database_table_instance_init (DataImportsFSpotDbFSpotDatabaseTable * self) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" self->priv = DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_PRIVATE (self); -#line 944 "FSpotDatabaseTable.c" +#line 950 "FSpotDatabaseTable.c" } @@ -952,7 +958,7 @@ static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatab _g_object_unref0 (self->behavior); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala" IMPORTABLE_DATABASE_TABLE_CLASS (data_imports_fspot_db_fspot_database_table_parent_class)->finalize (obj); -#line 956 "FSpotDatabaseTable.c" +#line 962 "FSpotDatabaseTable.c" } diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c index 8dc1559..c0fc03a 100644 --- a/plugins/shotwell-data-imports/FSpotImporter.c +++ b/plugins/shotwell-data-imports/FSpotImporter.c @@ -1,4 +1,4 @@ -/* FSpotImporter.c generated by valac 0.34.4, the Vala compiler +/* FSpotImporter.c generated by valac 0.34.7, the Vala compiler * generated from FSpotImporter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2860,7 +2860,7 @@ DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (G #line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" self->priv->tags_table = _tmp1_; #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp2_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _g_object_unref0 (self->priv->tags_map); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4033,7 +4033,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp36_ = all_photos; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp38_ = _tmp37_; #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4045,7 +4045,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp39_ = all_photos; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp41_ = _tmp40_; #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4070,7 +4070,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp44_ = _photo_row_list; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp46_ = _tmp45_; #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4206,7 +4206,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp61_ = _tag_row_list; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp63_ = _tmp62_; #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" @@ -4618,7 +4618,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp105_ = _photo_version_row_list; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" - _tmp106_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp106_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" _tmp107_ = _tmp106_; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala" diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c index 3be8630..55e20af 100644 --- a/plugins/shotwell-data-imports/FSpotMetaTable.c +++ b/plugins/shotwell-data-imports/FSpotMetaTable.c @@ -1,4 +1,4 @@ -/* FSpotMetaTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotMetaTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotMetaTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -273,7 +273,7 @@ DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_constru #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp0_ = db; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - self = (DataImportsFSpotDbFSpotMetaTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotMetaTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp1_ = data_imports_fspot_db_fspot_meta_behavior_get_instance (); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" @@ -1142,34 +1142,37 @@ gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpo if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { +#line 1146 "FSpotMetaTable.c" + gint64 _tmp1_ = 0LL; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_propagate_error (error, _inner_error_); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - return 0LL; -#line 1150 "FSpotMetaTable.c" + return _tmp1_; +#line 1152 "FSpotMetaTable.c" } else { + gint64 _tmp2_ = 0LL; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" g_clear_error (&_inner_error_); #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - return 0LL; -#line 1158 "FSpotMetaTable.c" + return _tmp2_; +#line 1161 "FSpotMetaTable.c" } } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (id_str != NULL) { -#line 1163 "FSpotMetaTable.c" - gint64 _tmp1_ = 0LL; +#line 1166 "FSpotMetaTable.c" + gint64 _tmp3_ = 0LL; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - _tmp1_ = int64_parse (id_str); + _tmp3_ = int64_parse (id_str); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" - result = _tmp1_; + result = _tmp3_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _g_free0 (id_str); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1173 "FSpotMetaTable.c" +#line 1176 "FSpotMetaTable.c" } else { #line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" result = (gint64) -1; @@ -1177,18 +1180,18 @@ gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpo _g_free0 (id_str); #line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1181 "FSpotMetaTable.c" +#line 1184 "FSpotMetaTable.c" } #line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _g_free0 (id_str); -#line 1185 "FSpotMetaTable.c" +#line 1188 "FSpotMetaTable.c" } static void data_imports_fspot_db_fspot_meta_table_class_init (DataImportsFSpotDbFSpotMetaTableClass * klass) { #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" data_imports_fspot_db_fspot_meta_table_parent_class = g_type_class_peek_parent (klass); -#line 1192 "FSpotMetaTable.c" +#line 1195 "FSpotMetaTable.c" } @@ -1228,21 +1231,21 @@ static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_beh self = (DataImportsFSpotDbFSpotMetaBehavior*) g_object_new (object_type, NULL); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return self; -#line 1232 "FSpotMetaTable.c" +#line 1235 "FSpotMetaTable.c" } static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_new (void) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return data_imports_fspot_db_fspot_meta_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR); -#line 1239 "FSpotMetaTable.c" +#line 1242 "FSpotMetaTable.c" } static gpointer _g_object_ref0 (gpointer self) { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return self ? g_object_ref (self) : NULL; -#line 1246 "FSpotMetaTable.c" +#line 1249 "FSpotMetaTable.c" } @@ -1255,7 +1258,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g _tmp0_ = data_imports_fspot_db_fspot_meta_behavior_instance; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" if (_tmp0_ == NULL) { -#line 1259 "FSpotMetaTable.c" +#line 1262 "FSpotMetaTable.c" DataImportsFSpotDbFSpotMetaBehavior* _tmp1_ = NULL; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp1_ = data_imports_fspot_db_fspot_meta_behavior_new (); @@ -1263,7 +1266,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g _g_object_unref0 (data_imports_fspot_db_fspot_meta_behavior_instance); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" data_imports_fspot_db_fspot_meta_behavior_instance = _tmp1_; -#line 1267 "FSpotMetaTable.c" +#line 1270 "FSpotMetaTable.c" } #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _tmp2_ = data_imports_fspot_db_fspot_meta_behavior_instance; @@ -1273,7 +1276,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g result = _tmp3_; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1277 "FSpotMetaTable.c" +#line 1280 "FSpotMetaTable.c" } @@ -1289,7 +1292,7 @@ static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (Dat result = _tmp0_; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1293 "FSpotMetaTable.c" +#line 1296 "FSpotMetaTable.c" } @@ -1321,13 +1324,13 @@ static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (Data if (result_length1) { #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" *result_length1 = _tmp3__length1; -#line 1325 "FSpotMetaTable.c" +#line 1328 "FSpotMetaTable.c" } #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" result = _tmp3_; #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" return result; -#line 1331 "FSpotMetaTable.c" +#line 1334 "FSpotMetaTable.c" } @@ -1381,11 +1384,11 @@ static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImport if (row) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" *row = _vala_row; -#line 1385 "FSpotMetaTable.c" +#line 1388 "FSpotMetaTable.c" } else { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" _g_object_unref0 (_vala_row); -#line 1389 "FSpotMetaTable.c" +#line 1392 "FSpotMetaTable.c" } } @@ -1395,7 +1398,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_class_init (DataImportsFSp data_imports_fspot_db_fspot_meta_behavior_parent_class = g_type_class_peek_parent (klass); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_meta_behavior_finalize; -#line 1399 "FSpotMetaTable.c" +#line 1402 "FSpotMetaTable.c" } @@ -1408,7 +1411,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspo iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns; #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row; -#line 1412 "FSpotMetaTable.c" +#line 1415 "FSpotMetaTable.c" } @@ -1422,7 +1425,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala" G_OBJECT_CLASS (data_imports_fspot_db_fspot_meta_behavior_parent_class)->finalize (obj); -#line 1426 "FSpotMetaTable.c" +#line 1429 "FSpotMetaTable.c" } diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c index 615eb70..b1e6274 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoTagsTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotPhotoTagsTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotPhotoTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -263,7 +263,7 @@ DataImportsFSpotDbFSpotPhotoTagsTable* data_imports_fspot_db_fspot_photo_tags_ta #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" _tmp0_ = db; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" - self = (DataImportsFSpotDbFSpotPhotoTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotPhotoTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" _tmp1_ = db_behavior; #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala" diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c index 8a40c4b..267d1f1 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoVersionsTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotPhotoVersionsTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotPhotoVersionsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -434,7 +434,7 @@ DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_ver #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp0_ = db; #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - self = (DataImportsFSpotDbFSpotPhotoVersionsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotPhotoVersionsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" _tmp1_ = db_behavior; #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" @@ -485,7 +485,7 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id ( #line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE (self), NULL); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" - _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" rows = _tmp0_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala" diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c index 364919f..af8cc0a 100644 --- a/plugins/shotwell-data-imports/FSpotPhotosTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotosTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotosTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotPhotosTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotPhotosTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -507,7 +507,7 @@ DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_con #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp0_ = db; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - self = (DataImportsFSpotDbFSpotPhotosTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotPhotosTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" _tmp1_ = db_behavior; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" @@ -543,7 +543,7 @@ GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpot #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE (self), NULL); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" - _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" all = _tmp0_; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala" diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c index d183ce0..f232dd9 100644 --- a/plugins/shotwell-data-imports/FSpotRollsTable.c +++ b/plugins/shotwell-data-imports/FSpotRollsTable.c @@ -1,4 +1,4 @@ -/* FSpotRollsTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotRollsTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotRollsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -316,7 +316,7 @@ DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_const #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp0_ = db; #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" - self = (DataImportsFSpotDbFSpotRollsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotRollsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" _tmp1_ = db_behavior; #line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala" diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.c b/plugins/shotwell-data-imports/FSpotTableBehavior.c index 3da1646..e3d5c7d 100644 --- a/plugins/shotwell-data-imports/FSpotTableBehavior.c +++ b/plugins/shotwell-data-imports/FSpotTableBehavior.c @@ -1,4 +1,4 @@ -/* FSpotTableBehavior.c generated by valac 0.34.4, the Vala compiler +/* FSpotTableBehavior.c generated by valac 0.34.7, the Vala compiler * generated from FSpotTableBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.c b/plugins/shotwell-data-imports/FSpotTagsTable.c index 291f238..95f6432 100644 --- a/plugins/shotwell-data-imports/FSpotTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotTagsTable.c generated by valac 0.34.4, the Vala compiler +/* FSpotTagsTable.c generated by valac 0.34.7, the Vala compiler * generated from FSpotTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -319,7 +319,7 @@ DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_constru #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp0_ = db; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" - self = (DataImportsFSpotDbFSpotTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_); + self = (DataImportsFSpotDbFSpotTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" _tmp1_ = db_behavior; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" @@ -557,7 +557,7 @@ GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImport #line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (self), NULL); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" - _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" rows = _tmp0_; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala" diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c index 0dad7df..c02a5e6 100644 --- a/plugins/shotwell-data-imports/SqliteSupport.c +++ b/plugins/shotwell-data-imports/SqliteSupport.c @@ -1,4 +1,4 @@ -/* SqliteSupport.c generated by valac 0.34.4, the Vala compiler +/* SqliteSupport.c generated by valac 0.34.7, the Vala compiler * generated from SqliteSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c index 93ab197..7d21a8d 100644 --- a/plugins/shotwell-data-imports/VersionNumber.c +++ b/plugins/shotwell-data-imports/VersionNumber.c @@ -1,4 +1,4 @@ -/* VersionNumber.c generated by valac 0.34.4, the Vala compiler +/* VersionNumber.c generated by valac 0.34.7, the Vala compiler * generated from VersionNumber.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c index df48222..31600b3 100644 --- a/plugins/shotwell-data-imports/shotwell-data-imports.c +++ b/plugins/shotwell-data-imports/shotwell-data-imports.c @@ -1,4 +1,4 @@ -/* shotwell-data-imports.c generated by valac 0.34.4, the Vala compiler +/* shotwell-data-imports.c generated by valac 0.34.7, the Vala compiler * generated from shotwell-data-imports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h index 3bcb68a..578c7a2 100644 --- a/plugins/shotwell-plugin-common.h +++ b/plugins/shotwell-plugin-common.h @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.h generated by valac 0.34.4, the Vala compiler, do not modify */ +/* shotwell-plugin-common.h generated by valac 0.34.7, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_COMMON_H__ diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi index 8d3965b..a37ad0e 100644 --- a/plugins/shotwell-plugin-common.vapi +++ b/plugins/shotwell-plugin-common.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.vapi generated by valac 0.34.4, do not modify. */ +/* shotwell-plugin-common.vapi generated by valac 0.34.7, do not modify. */ namespace Publishing { namespace RESTSupport { diff --git a/plugins/shotwell-plugin-dev-1.0.h b/plugins/shotwell-plugin-dev-1.0.h index ac74eca..4429651 100644 --- a/plugins/shotwell-plugin-dev-1.0.h +++ b/plugins/shotwell-plugin-dev-1.0.h @@ -1,4 +1,4 @@ -/* shotwell-plugin-dev-1.0.h generated by valac 0.34.4, the Vala compiler, do not modify */ +/* shotwell-plugin-dev-1.0.h generated by valac 0.34.7, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_DEV_1_0_H__ diff --git a/plugins/shotwell-plugin-dev-1.0.vapi b/plugins/shotwell-plugin-dev-1.0.vapi index fd0d0a8..ad91c03 100644 --- a/plugins/shotwell-plugin-dev-1.0.vapi +++ b/plugins/shotwell-plugin-dev-1.0.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-dev-1.0.vapi generated by valac 0.34.4, do not modify. */ +/* shotwell-plugin-dev-1.0.vapi generated by valac 0.34.7, do not modify. */ namespace Spit { namespace DataImports { diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c index a2e4c0e..29ade8e 100644 --- a/plugins/shotwell-publishing-extras/GalleryConnector.c +++ b/plugins/shotwell-publishing-extras/GalleryConnector.c @@ -1,4 +1,4 @@ -/* GalleryConnector.c generated by valac 0.34.4, the Vala compiler +/* GalleryConnector.c generated by valac 0.34.7, the Vala compiler * generated from GalleryConnector.vala, do not modify */ /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org @@ -6284,7 +6284,7 @@ static void publishing_gallery3_gallery_upload_transaction_class_init (Publishin #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryUploadTransactionPrivate)); #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_gallery3_gallery_upload_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_gallery3_gallery_upload_transaction_real_execute; #line 6257 "GalleryConnector.c" } @@ -12641,7 +12641,7 @@ static void publishing_gallery3_session_class_init (PublishingGallery3SessionCla #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3SessionPrivate)); #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_gallery3_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_gallery3_session_real_is_authenticated; #line 12603 "GalleryConnector.c" } @@ -12849,7 +12849,7 @@ static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderC #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3UploaderPrivate)); #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_gallery3_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_gallery3_uploader_real_create_transaction; #line 12811 "GalleryConnector.c" } diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c index f5faf8d..475b3d2 100644 --- a/plugins/shotwell-publishing-extras/RajcePublishing.c +++ b/plugins/shotwell-publishing-extras/RajcePublishing.c @@ -1,4 +1,4 @@ -/* RajcePublishing.c generated by valac 0.34.4, the Vala compiler +/* RajcePublishing.c generated by valac 0.34.7, the Vala compiler * generated from RajcePublishing.vala, do not modify */ /* Copyright 2014 rajce.net @@ -2555,7 +2555,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin #line 2555 "RajcePublishing.c" } #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp8_ = gee_array_list_new (PUBLISHING_RAJCE_TYPE_ALBUM, (GBoxedCopyFunc) publishing_rajce_album_ref, publishing_rajce_album_unref, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (PUBLISHING_RAJCE_TYPE_ALBUM, (GBoxedCopyFunc) publishing_rajce_album_ref, (GDestroyNotify) publishing_rajce_album_unref, NULL, NULL, NULL); #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" list = _tmp8_; #line 2561 "RajcePublishing.c" @@ -6295,7 +6295,7 @@ static void publishing_rajce_uploader_class_init (PublishingRajceUploaderClass * #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajceUploaderPrivate)); #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_rajce_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_rajce_uploader_real_create_transaction; #line 6296 "RajcePublishing.c" } @@ -8900,7 +8900,7 @@ static void publishing_rajce_session_class_init (PublishingRajceSessionClass * k #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajceSessionPrivate)); #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_rajce_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_rajce_session_real_is_authenticated; #line 8901 "RajcePublishing.c" } diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c index a10e9a6..a04cec6 100644 --- a/plugins/shotwell-publishing-extras/TumblrPublishing.c +++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c @@ -1,4 +1,4 @@ -/* TumblrPublishing.c generated by valac 0.34.4, the Vala compiler +/* TumblrPublishing.c generated by valac 0.34.7, the Vala compiler * generated from TumblrPublishing.vala, do not modify */ /* Copyright 2012 BJA Electronics @@ -3538,7 +3538,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishables_size_ = publishables_length1; #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" sorted_list = _tmp13_; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -5496,7 +5496,7 @@ static void publishing_tumblr_tumblr_publisher_transaction_class_init (Publishin #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_transaction_parent_class = g_type_class_peek_parent (klass); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_tumblr_tumblr_publisher_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_tumblr_tumblr_publisher_transaction_real_execute; #line 5483 "TumblrPublishing.c" } @@ -7143,7 +7143,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (Pu #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploadTransactionPrivate)); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_tumblr_tumblr_publisher_upload_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute; #line 7129 "TumblrPublishing.c" } @@ -7271,7 +7271,7 @@ static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTu #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate)); #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_tumblr_tumblr_publisher_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction; #line 7257 "TumblrPublishing.c" } @@ -8240,7 +8240,7 @@ static void publishing_tumblr_tumblr_publisher_session_class_init (PublishingTum #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherSessionPrivate)); #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_tumblr_tumblr_publisher_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_tumblr_tumblr_publisher_session_real_is_authenticated; #line 8224 "TumblrPublishing.c" } diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c index 78c863a..54894d6 100644 --- a/plugins/shotwell-publishing-extras/YandexPublishing.c +++ b/plugins/shotwell-publishing-extras/YandexPublishing.c @@ -1,4 +1,4 @@ -/* YandexPublishing.c generated by valac 0.34.4, the Vala compiler +/* YandexPublishing.c generated by valac 0.34.7, the Vala compiler * generated from YandexPublishing.vala, do not modify */ /* Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net> @@ -916,7 +916,7 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass * #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate)); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_yandex_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_yandex_session_real_is_authenticated; #line 921 "YandexPublishing.c" } @@ -1308,9 +1308,9 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYandexWebAuthPanePrivate)); #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - ((GObjectClass *) klass)->constructed = publishing_yandex_web_auth_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_yandex_web_auth_pane_real_constructed; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_yandex_web_auth_pane_real_on_page_load; + ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_yandex_web_auth_pane_real_on_page_load; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_yandex_web_auth_pane_finalize; #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1791,7 +1791,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp11_ = list; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp12_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_MAP, GeeMap)); + _tmp12_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp13_ = _tmp12_; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2206,7 +2206,7 @@ static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate)); #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_yandex_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_yandex_uploader_real_create_transaction; #line 2211 "YandexPublishing.c" } @@ -2763,7 +2763,7 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->session = _tmp2_; #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp3_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (self->priv->album_list); #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c index d45c9d1..eb4ec9e 100644 --- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c +++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c @@ -1,4 +1,4 @@ -/* shotwell-publishing-extras.c generated by valac 0.34.4, the Vala compiler +/* shotwell-publishing-extras.c generated by valac 0.34.7, the Vala compiler * generated from shotwell-publishing-extras.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c index 7e06d66..a16729e 100644 --- a/plugins/shotwell-publishing/FacebookPublishing.c +++ b/plugins/shotwell-publishing/FacebookPublishing.c @@ -1,4 +1,4 @@ -/* FacebookPublishing.c generated by valac 0.34.4, the Vala compiler +/* FacebookPublishing.c generated by valac 0.34.7, the Vala compiler * generated from FacebookPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -6531,9 +6531,9 @@ static void publishing_facebook_graph_message_class_init (PublishingFacebookGrap #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" ((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_message_finalize; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphMessageClass *) klass)->get_uri = publishing_facebook_graph_message_real_get_uri; + ((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_message_real_get_uri; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphMessageClass *) klass)->get_response_body = publishing_facebook_graph_message_real_get_response_body; + ((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_message_real_get_response_body; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_signal_new ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" @@ -7626,11 +7626,11 @@ static void publishing_facebook_graph_session_graph_message_impl_class_init (Pub #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" ((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_session_graph_message_impl_finalize; #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission; + ((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*)(PublishingFacebookGraphSessionGraphMessageImpl*)) publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission; #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphMessageClass *) klass)->get_uri = publishing_facebook_graph_session_graph_message_impl_real_get_uri; + ((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_session_graph_message_impl_real_get_uri; #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphMessageClass *) klass)->get_response_body = publishing_facebook_graph_session_graph_message_impl_real_get_response_body; + ((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*)(PublishingFacebookGraphMessage*)) publishing_facebook_graph_session_graph_message_impl_real_get_response_body; #line 7615 "FacebookPublishing.c" } @@ -8428,7 +8428,7 @@ static void publishing_facebook_graph_session_graph_upload_message_class_init (P #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionGraphUploadMessagePrivate)); #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - ((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission; + ((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*)(PublishingFacebookGraphSessionGraphMessageImpl*)) publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission; #line 8413 "FacebookPublishing.c" } diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c index 55ad837..a15a23d 100644 --- a/plugins/shotwell-publishing/FlickrPublishing.c +++ b/plugins/shotwell-publishing/FlickrPublishing.c @@ -1,4 +1,4 @@ -/* FlickrPublishing.c generated by valac 0.34.4, the Vala compiler +/* FlickrPublishing.c generated by valac 0.34.7, the Vala compiler * generated from FlickrPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2927,7 +2927,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishables_size_ = publishables_length1; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" sorted_list = _tmp13_; #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3837,7 +3837,7 @@ static void publishing_flickr_transaction_class_init (PublishingFlickrTransactio #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass); #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_flickr_transaction_real_execute; #line 3827 "FlickrPublishing.c" } @@ -4539,7 +4539,7 @@ static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUpl #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate)); #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_upload_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_flickr_upload_transaction_real_execute; #line 4528 "FlickrPublishing.c" } @@ -5555,7 +5555,7 @@ static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate)); #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_flickr_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_flickr_session_real_is_authenticated; #line 5541 "FlickrPublishing.c" } @@ -7913,7 +7913,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU gchar** _tmp61_ = NULL; gint _tmp61__length1 = 0; #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet); #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8249,7 +8249,7 @@ static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate)); #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_flickr_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction; #line 8231 "FlickrPublishing.c" } diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c index a040029..e066a1f 100644 --- a/plugins/shotwell-publishing/PicasaPublishing.c +++ b/plugins/shotwell-publishing/PicasaPublishing.c @@ -1,4 +1,4 @@ -/* PicasaPublishing.c generated by valac 0.34.4, the Vala compiler +/* PicasaPublishing.c generated by valac 0.34.7, the Vala compiler * generated from PicasaPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2463,17 +2463,17 @@ static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicas #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPicasaPicasaPublisherPrivate)); #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_picasa_picasa_publisher_real_on_login_flow_complete; + ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_on_login_flow_complete; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_picasa_picasa_publisher_real_do_logout; + ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_do_logout; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_picasa_picasa_publisher_real_is_running; + ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_is_running; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_picasa_picasa_publisher_real_start; + ((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_start; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_picasa_picasa_publisher_real_stop; + ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_stop; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = publishing_picasa_picasa_publisher_real_get_authenticator; + ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*)(PublishingRESTSupportGooglePublisher*)) publishing_picasa_picasa_publisher_real_get_authenticator; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_picasa_picasa_publisher_finalize; #line 2464 "PicasaPublishing.c" @@ -4455,7 +4455,7 @@ static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUpl #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate)); #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_picasa_upload_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_picasa_upload_transaction_real_execute; #line 4444 "PicasaPublishing.c" } @@ -6730,7 +6730,7 @@ static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate)); #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_picasa_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_picasa_uploader_real_create_transaction; #line 6719 "PicasaPublishing.c" } diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c index 8d6eaa6..3e50423 100644 --- a/plugins/shotwell-publishing/PiwigoPublishing.c +++ b/plugins/shotwell-publishing/PiwigoPublishing.c @@ -1,4 +1,4 @@ -/* PiwigoPublishing.c generated by valac 0.34.4, the Vala compiler +/* PiwigoPublishing.c generated by valac 0.34.7, the Vala compiler * generated from PiwigoPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -4805,7 +4805,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" uppercats = _tmp21_; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp22_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp22_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" id_map = _tmp22_; #line 4806 "PiwigoPublishing.c" @@ -6895,7 +6895,7 @@ static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoUploaderPrivate)); #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_piwigo_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_piwigo_uploader_real_create_transaction; #line 6890 "PiwigoPublishing.c" } @@ -7389,7 +7389,7 @@ static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErro #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoSSLErrorPanePrivate)); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((GObjectClass *) klass)->constructed = publishing_piwigo_ssl_error_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_piwigo_ssl_error_pane_real_constructed; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_ssl_error_pane_get_property; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8132,9 +8132,9 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoAuthenticationPanePrivate)); #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((GObjectClass *) klass)->constructed = publishing_piwigo_authentication_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_piwigo_authentication_pane_real_constructed; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = publishing_piwigo_authentication_pane_real_on_pane_installed; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*)(ShotwellPluginsCommonBuilderPane*)) publishing_piwigo_authentication_pane_real_on_pane_installed; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_authentication_pane_get_property; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8347,7 +8347,7 @@ PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7__length1 = _tmp6__length1; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp8_ = gee_array_list_new_wrap (PUBLISHING_PIWIGO_TYPE_CATEGORY, (GBoxedCopyFunc) publishing_piwigo_category_ref, publishing_piwigo_category_unref, _tmp7_, _tmp7__length1, _publishing_piwigo_category_equal_gee_equal_data_func, NULL, NULL); + _tmp8_ = gee_array_list_new_wrap (PUBLISHING_PIWIGO_TYPE_CATEGORY, (GBoxedCopyFunc) publishing_piwigo_category_ref, (GDestroyNotify) publishing_piwigo_category_unref, _tmp7_, _tmp7__length1, _publishing_piwigo_category_equal_gee_equal_data_func, NULL, NULL); #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = _tmp8_; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -10890,9 +10890,9 @@ static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwi #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoPublishingOptionsPanePrivate)); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((GObjectClass *) klass)->constructed = publishing_piwigo_publishing_options_pane_real_constructed; + ((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_piwigo_publishing_options_pane_real_constructed; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = publishing_piwigo_publishing_options_pane_real_on_pane_installed; + ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*)(ShotwellPluginsCommonBuilderPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_installed; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_publishing_options_pane_get_property; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -11339,7 +11339,7 @@ static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoSessionPrivate)); #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_piwigo_session_real_is_authenticated; + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_piwigo_session_real_is_authenticated; #line 11329 "PiwigoPublishing.c" } diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c index 0c3d84e..188562b 100644 --- a/plugins/shotwell-publishing/YouTubePublishing.c +++ b/plugins/shotwell-publishing/YouTubePublishing.c @@ -1,4 +1,4 @@ -/* YouTubePublishing.c generated by valac 0.34.4, the Vala compiler +/* YouTubePublishing.c generated by valac 0.34.7, the Vala compiler * generated from YouTubePublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2053,17 +2053,17 @@ static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTube #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubePublisherPrivate)); #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_you_tube_you_tube_publisher_real_is_running; + ((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_is_running; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_you_tube_you_tube_publisher_real_start; + ((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_start; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_you_tube_you_tube_publisher_real_stop; + ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_stop; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_you_tube_you_tube_publisher_real_on_login_flow_complete; + ((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_on_login_flow_complete; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_you_tube_you_tube_publisher_real_do_logout; + ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_do_logout; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = publishing_you_tube_you_tube_publisher_real_get_authenticator; + ((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*)(PublishingRESTSupportGooglePublisher*)) publishing_you_tube_you_tube_publisher_real_get_authenticator; #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_publisher_finalize; #line 2063 "YouTubePublishing.c" @@ -3910,7 +3910,7 @@ static void publishing_you_tube_upload_transaction_class_init (PublishingYouTube #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate)); #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_you_tube_upload_transaction_real_execute; + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_you_tube_upload_transaction_real_execute; #line 3908 "YouTubePublishing.c" } @@ -4055,7 +4055,7 @@ static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderCl #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate)); #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_you_tube_uploader_real_create_transaction; + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_you_tube_uploader_real_create_transaction; #line 4053 "YouTubePublishing.c" } diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c index 98b3abd..eca05dc 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.c +++ b/plugins/shotwell-publishing/shotwell-publishing.c @@ -1,4 +1,4 @@ -/* shotwell-publishing.c generated by valac 0.34.4, the Vala compiler +/* shotwell-publishing.c generated by valac 0.34.7, the Vala compiler * generated from shotwell-publishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c index fb43939..516eefc 100644 --- a/plugins/shotwell-transitions/BlindsEffect.c +++ b/plugins/shotwell-transitions/BlindsEffect.c @@ -1,4 +1,4 @@ -/* BlindsEffect.c generated by valac 0.34.4, the Vala compiler +/* BlindsEffect.c generated by valac 0.34.7, the Vala compiler * generated from BlindsEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -205,11 +205,11 @@ static void blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * k #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" blinds_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = blinds_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) blinds_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = blinds_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) blinds_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = blinds_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) blinds_effect_descriptor_real_create; #line 214 "BlindsEffect.c" } diff --git a/plugins/shotwell-transitions/ChessEffect.c b/plugins/shotwell-transitions/ChessEffect.c index 0cb60bf..712d938 100644 --- a/plugins/shotwell-transitions/ChessEffect.c +++ b/plugins/shotwell-transitions/ChessEffect.c @@ -1,4 +1,4 @@ -/* ChessEffect.c generated by valac 0.34.4, the Vala compiler +/* ChessEffect.c generated by valac 0.34.7, the Vala compiler * generated from ChessEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -197,11 +197,11 @@ static void chess_effect_descriptor_class_init (ChessEffectDescriptorClass * kla #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" chess_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = chess_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) chess_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = chess_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) chess_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = chess_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) chess_effect_descriptor_real_create; #line 206 "ChessEffect.c" } diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c index c905549..41871a7 100644 --- a/plugins/shotwell-transitions/CircleEffect.c +++ b/plugins/shotwell-transitions/CircleEffect.c @@ -1,4 +1,4 @@ -/* CircleEffect.c generated by valac 0.34.4, the Vala compiler +/* CircleEffect.c generated by valac 0.34.7, the Vala compiler * generated from CircleEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -189,11 +189,11 @@ static void circle_effect_descriptor_class_init (CircleEffectDescriptorClass * k #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" circle_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = circle_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) circle_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = circle_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) circle_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = circle_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) circle_effect_descriptor_real_create; #line 198 "CircleEffect.c" } diff --git a/plugins/shotwell-transitions/CirclesEffect.c b/plugins/shotwell-transitions/CirclesEffect.c index 9450def..b4b82c6 100644 --- a/plugins/shotwell-transitions/CirclesEffect.c +++ b/plugins/shotwell-transitions/CirclesEffect.c @@ -1,4 +1,4 @@ -/* CirclesEffect.c generated by valac 0.34.4, the Vala compiler +/* CirclesEffect.c generated by valac 0.34.7, the Vala compiler * generated from CirclesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -190,11 +190,11 @@ static void circles_effect_descriptor_class_init (CirclesEffectDescriptorClass * #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" circles_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = circles_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) circles_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = circles_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) circles_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = circles_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) circles_effect_descriptor_real_create; #line 199 "CirclesEffect.c" } diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c index ddf902e..8f5ed37 100644 --- a/plugins/shotwell-transitions/ClockEffect.c +++ b/plugins/shotwell-transitions/ClockEffect.c @@ -1,4 +1,4 @@ -/* ClockEffect.c generated by valac 0.34.4, the Vala compiler +/* ClockEffect.c generated by valac 0.34.7, the Vala compiler * generated from ClockEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -190,11 +190,11 @@ static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * kla #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" clock_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = clock_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) clock_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = clock_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) clock_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = clock_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) clock_effect_descriptor_real_create; #line 199 "ClockEffect.c" } diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c index 11f0a95..5b490c9 100644 --- a/plugins/shotwell-transitions/CrumbleEffect.c +++ b/plugins/shotwell-transitions/CrumbleEffect.c @@ -1,4 +1,4 @@ -/* CrumbleEffect.c generated by valac 0.34.4, the Vala compiler +/* CrumbleEffect.c generated by valac 0.34.7, the Vala compiler * generated from CrumbleEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -208,11 +208,11 @@ static void crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass * #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" crumble_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = crumble_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) crumble_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = crumble_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) crumble_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = crumble_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) crumble_effect_descriptor_real_create; #line 217 "CrumbleEffect.c" } diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c index a7f76aa..fd081d0 100644 --- a/plugins/shotwell-transitions/FadeEffect.c +++ b/plugins/shotwell-transitions/FadeEffect.c @@ -1,4 +1,4 @@ -/* FadeEffect.c generated by valac 0.34.4, the Vala compiler +/* FadeEffect.c generated by valac 0.34.7, the Vala compiler * generated from FadeEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -189,11 +189,11 @@ static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" fade_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = fade_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) fade_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = fade_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) fade_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = fade_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) fade_effect_descriptor_real_create; #line 198 "FadeEffect.c" } diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c index 1797114..678cc11 100644 --- a/plugins/shotwell-transitions/SlideEffect.c +++ b/plugins/shotwell-transitions/SlideEffect.c @@ -1,4 +1,4 @@ -/* SlideEffect.c generated by valac 0.34.4, the Vala compiler +/* SlideEffect.c generated by valac 0.34.7, the Vala compiler * generated from SlideEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -190,11 +190,11 @@ static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * kla #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" slide_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = slide_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) slide_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = slide_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) slide_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = slide_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) slide_effect_descriptor_real_create; #line 199 "SlideEffect.c" } diff --git a/plugins/shotwell-transitions/SquaresEffect.c b/plugins/shotwell-transitions/SquaresEffect.c index b81172a..fdf32ee 100644 --- a/plugins/shotwell-transitions/SquaresEffect.c +++ b/plugins/shotwell-transitions/SquaresEffect.c @@ -1,4 +1,4 @@ -/* SquaresEffect.c generated by valac 0.34.4, the Vala compiler +/* SquaresEffect.c generated by valac 0.34.7, the Vala compiler * generated from SquaresEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -197,11 +197,11 @@ static void squares_effect_descriptor_class_init (SquaresEffectDescriptorClass * #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" squares_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = squares_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) squares_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = squares_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) squares_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = squares_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) squares_effect_descriptor_real_create; #line 206 "SquaresEffect.c" } diff --git a/plugins/shotwell-transitions/StripesEffect.c b/plugins/shotwell-transitions/StripesEffect.c index a4aa40b..eec9185 100644 --- a/plugins/shotwell-transitions/StripesEffect.c +++ b/plugins/shotwell-transitions/StripesEffect.c @@ -1,4 +1,4 @@ -/* StripesEffect.c generated by valac 0.34.4, the Vala compiler +/* StripesEffect.c generated by valac 0.34.7, the Vala compiler * generated from StripesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav @@ -196,11 +196,11 @@ static void stripes_effect_descriptor_class_init (StripesEffectDescriptorClass * #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" stripes_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = stripes_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) stripes_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = stripes_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) stripes_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = stripes_effect_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) stripes_effect_descriptor_real_create; #line 205 "StripesEffect.c" } diff --git a/plugins/shotwell-transitions/shotwell-transitions.c b/plugins/shotwell-transitions/shotwell-transitions.c index b3a448a..e8e7b90 100644 --- a/plugins/shotwell-transitions/shotwell-transitions.c +++ b/plugins/shotwell-transitions/shotwell-transitions.c @@ -1,4 +1,4 @@ -/* shotwell-transitions.c generated by valac 0.34.4, the Vala compiler +/* shotwell-transitions.c generated by valac 0.34.7, the Vala compiler * generated from shotwell-transitions.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -998,11 +998,11 @@ static void shotwell_transition_descriptor_class_init (ShotwellTransitionDescrip #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" shotwell_transition_descriptor_parent_class = g_type_class_peek_parent (klass); #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = shotwell_transition_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) shotwell_transition_descriptor_real_get_id; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = shotwell_transition_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) shotwell_transition_descriptor_real_get_pluggable_name; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = shotwell_transition_descriptor_real_create; + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) shotwell_transition_descriptor_real_create; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_transition_descriptor_finalize; #line 1008 "shotwell-transitions.c" |