From 8adc200bbabaaedf725f838305065130967b1aa3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 25 Apr 2011 21:24:17 +0200 Subject: [PATCH] Strip scheme and www. in completion to reduce noise Related to: https://bugs.launchpad.net/midori/+bug/752915 --- midori/midori-locationaction.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index c0a55abb..f5176062 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1063,8 +1063,19 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, if (G_LIKELY (uri)) { - temp_iter = temp = g_utf8_strdown (uri, -1); - desc_iter = uri; + /* Strip URI scheme and www. for display to reduce visual noise */ + gchar* stripped_uri = uri; + if (g_str_has_prefix (uri, "http://")) + stripped_uri = &uri[7]; + else if (g_str_has_prefix (uri, "https://")) + stripped_uri = &uri[8]; + else if (g_str_has_prefix (uri, "file://")) + stripped_uri = &uri[7]; + if (g_str_has_prefix (stripped_uri, "www.")) + stripped_uri = &stripped_uri[4]; + + temp_iter = temp = g_utf8_strdown (stripped_uri, -1); + desc_iter = stripped_uri; key_idx = 0; key = keys[key_idx]; offset = 0; @@ -1114,7 +1125,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, katze_assign (desc_uri, temp_concat); } else - desc_uri = g_markup_escape_text (uri, -1); + desc_uri = g_markup_escape_text (stripped_uri, -1); g_free (temp); }