diff options
| author | Günther Wagner <info@gunibert.de> | 2022-02-02 12:03:40 +0000 |
|---|---|---|
| committer | Günther Wagner <info@gunibert.de> | 2022-02-02 12:03:40 +0000 |
| commit | 27017971c773cf3e1b71b7851a17fcd084549c0d (patch) | |
| tree | 59735adb85ef5243f5d39e6682ec53f38eefa920 | |
| parent | 19862a6803c35e55be5fb7d15f985e4232dede85 (diff) | |
| parent | 3f24d5a233acd71d0c4c6b1541e70e81b66e9421 (diff) | |
| download | librest-27017971c773cf3e1b71b7851a17fcd084549c0d.tar.gz | |
Merge branch 'wip/hadess/compilation-fixes' into 'master'
Some build fixes
See merge request GNOME/librest!16
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | examples/demo/demo-rest-page.c | 4 | ||||
| -rw-r--r-- | rest/rest-oauth2-proxy.c | 4 | ||||
| -rw-r--r-- | rest/rest-params.h | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a656e19..10ff914 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ variables: FLATPAK_MODULE: 'librest-demo' FLATPAK_BUILD_DIR: build -image: fedora:34 +image: fedora:36 stages: - build @@ -23,8 +23,9 @@ build-librest: - dnf -y install --nogpgcheck redhat-rpm-config glib2-devel gobject-introspection-devel libxml2-devel meson ninja-build libsoup-devel vala json-glib-devel git python3-jinja2 python3-toml python3-typogrify python3-pygments + libadwaita-devel gtksourceview5-devel script: - - meson _build -Dexamples=false + - meson _build -Dexamples=true - ninja -C _build - bash +x ./.gitlab-ci/run-tests.sh artifacts: diff --git a/examples/demo/demo-rest-page.c b/examples/demo/demo-rest-page.c index 46ebfec..e2f71d5 100644 --- a/examples/demo/demo-rest-page.c +++ b/examples/demo/demo-rest-page.c @@ -495,7 +495,11 @@ on_send_clicked (GtkButton *btn, break; } } +#if WITH_SOUP_2 + SoupLogger *logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, -1); +#else SoupLogger *logger = soup_logger_new (SOUP_LOGGER_LOG_BODY); +#endif rest_proxy_add_soup_feature (proxy, SOUP_SESSION_FEATURE (logger)); RestProxyCall *call = rest_proxy_new_call (proxy); diff --git a/rest/rest-oauth2-proxy.c b/rest/rest-oauth2-proxy.c index f15b589..fb66f91 100644 --- a/rest/rest-oauth2-proxy.c +++ b/rest/rest-oauth2-proxy.c @@ -111,7 +111,7 @@ rest_oauth2_proxy_new_call (RestProxy *proxy) { RestOAuth2Proxy *self = (RestOAuth2Proxy *)proxy; RestProxyCall *call; - g_autofree gchar *auth; + g_autofree gchar *auth = NULL; g_return_val_if_fail (REST_IS_OAUTH2_PROXY (self), NULL); @@ -352,7 +352,7 @@ rest_oauth2_proxy_build_authorization_url (RestOAuth2Proxy *self, g_autoptr(GHashTable) params = NULL; g_autoptr(GUri) auth = NULL; g_autoptr(GUri) authorization_url = NULL; - g_autofree gchar *params_string; + g_autofree gchar *params_string = NULL; g_return_val_if_fail (REST_IS_OAUTH2_PROXY (self), NULL); diff --git a/rest/rest-params.h b/rest/rest-params.h index 9f53f77..74a3b37 100644 --- a/rest/rest-params.h +++ b/rest/rest-params.h @@ -59,7 +59,7 @@ RestParam *rest_params_get (RestParams *params, void rest_params_remove (RestParams *params, const char *name); gboolean rest_params_are_strings (RestParams *params); -GHashTable *rest_params_as_string_hash_table (RestParams *params); +GHashTable *rest_params_as_string_hash_table (RestParams *self); void rest_params_iter_init (RestParamsIter *iter, RestParams *params); gboolean rest_params_iter_next (RestParamsIter *iter, |