From b748c68f4c0557e4c663d8d108a45f3edfca1898 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 16 Dec 2019 03:25:15 +0100 Subject: uri.c: Revert to g_uri_parse_scheme() instead of SoupURI --- uri.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/uri.c b/uri.c index bc2bc01..7b97e48 100644 --- a/uri.c +++ b/uri.c @@ -4,6 +4,7 @@ #include "uri.h" +#include /* g_strcmp0() */ #include /* g_fprintf() */ #include /* soup* */ #include /* access() */ @@ -12,26 +13,10 @@ const gchar * badwolf_ensure_uri_scheme(const gchar *text, gboolean try_file) { const gchar *fallback = "about:blank"; - SoupURI *uri; - uri = soup_uri_new(text); - if(!uri) return fallback; + if(g_strcmp0(text, "") <= 0) return fallback; - //g_fprintf(stderr, "uri->scheme = %s, uri->path = %s\n", uri->scheme, uri->path); - - if(!uri->path) - { - soup_uri_free(uri); - return fallback; - } - - if(uri->scheme) - { - soup_uri_free(uri); - return text; - } - - soup_uri_free(uri); + if(g_uri_parse_scheme(text)) return text; if(try_file && (access(text, R_OK) == 0)) return g_strdup_printf("file://%s", text); -- cgit v1.3.1-23-gd82d