[epiphany] ephy-web-view: use ephy_string_get_host_name
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-web-view: use ephy_string_get_host_name
- Date: Fri, 17 Aug 2012 15:33:22 +0000 (UTC)
commit d4253831bba6bfa2268c07c42e82d8d6272a4f0e
Author: Xan Lopez <xan igalia com>
Date: Fri Aug 17 17:25:25 2012 +0200
ephy-web-view: use ephy_string_get_host_name
Saves some code duplication.
embed/ephy-web-view.c | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index ae99cf1..12e5f51 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2853,33 +2853,27 @@ ephy_web_view_new (void)
static gboolean
is_public_domain (EphyWebView *view, const char *url)
{
- SoupURI *soup_uri;
gboolean retval = FALSE;
- const char *host = NULL;
+ char *host = NULL;
EphyWebViewPrivate *priv = view->priv;
- soup_uri = soup_uri_new (url);
- if (!soup_uri) {
- char *effective_url = g_strconcat ("http://", url, NULL);
- soup_uri = soup_uri_new (effective_url);
- g_free (effective_url);
- }
- g_return_val_if_fail (soup_uri, FALSE);
-
- host = soup_uri->host;
+ host = ephy_string_get_host_name (url);
+ g_return_val_if_fail (host, FALSE);
if (g_regex_match (priv->domain_regex, host, 0, NULL)) {
if (g_str_equal (host, "localhost"))
retval = TRUE;
else {
- host = g_strrstr (host, ".");
+ const char *end;
- if (host && *host != '\0')
- retval = soup_tld_domain_is_public_suffix (host);
+ end = g_strrstr (host, ".");
+
+ if (end && *end != '\0')
+ retval = soup_tld_domain_is_public_suffix (end);
}
}
- soup_uri_free (soup_uri);
+ g_free (host);
return retval;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]