[gitg/carlosgc/guri] Use GUri instead of SoupURI
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/carlosgc/guri] Use GUri instead of SoupURI
- Date: Tue, 23 Mar 2021 15:16:06 +0000 (UTC)
commit bf3639080f2c1e75dcd22a16d57064608801739b
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Tue Mar 23 16:14:34 2021 +0100
Use GUri instead of SoupURI
It removes the direct dependency on libsoup so that we don't need to
migrate to libsoup3
Fixes #324
PACKAGING | 2 +-
libgitg/gitg-credentials-manager.vala | 4 ++--
meson.build | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/PACKAGING b/PACKAGING
index 68199d11..fe0f11bc 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -87,7 +87,7 @@ Installed:
Following is a list of dependencies of gitg. Note that these are subject to
change and a definite list can be obtained by inspecting configure.ac instead:
-- glib >= 2.38
+- glib >= 2.68
- gtk+ >= 3.10
- gtksourceview >= 3.10
- gobject-introspection >= 0.10.1
diff --git a/libgitg/gitg-credentials-manager.vala b/libgitg/gitg-credentials-manager.vala
index 331aaaf5..686a6889 100644
--- a/libgitg/gitg-credentials-manager.vala
+++ b/libgitg/gitg-credentials-manager.vala
@@ -225,13 +225,13 @@ public class CredentialsManager
}
else
{
- var uri = new Soup.URI(url);
+ var uri = GLib.Uri.parse(url, GLib.UriFlags.NONE);
if (uri != null)
{
host = uri.get_host();
- if (!uri.uses_default_port())
+ if (uri.get_port() != -1)
{
host = @"$(host):$(uri.get_port())";
}
diff --git a/meson.build b/meson.build
index f5db5ae8..a4fdec13 100644
--- a/meson.build
+++ b/meson.build
@@ -123,7 +123,7 @@ add_project_arguments('--vapidir=' + vapi_dir, language: 'vala')
symbol_map = join_paths(source_root, 'libgitg.map')
common_ldflags = cc.get_supported_link_arguments('-Wl,--version-script,@0@'.format(symbol_map))
-glib_req_version = '>= 2.38'
+glib_req_version = '>= 2.68'
gee_dep = dependency('gee-0.8')
gio_dep = dependency('gio-2.0', version: glib_req_version)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]