Merge branch 'features/uri-decoded' into develop

1 files changed, 6 insertions, 1 deletions

diff --git a/badwolf.c b/badwolf.c
index 1fef34e..6a4fa3b 100644
--- a/badwolf.c
+++ b/badwolf.c
@@ -202,6 +202,11 @@ WebViewCb_notify__uri(WebKitWebView *webView, GParamSpec *pspec, gpointer user_d
 
 	gtk_entry_set_text(GTK_ENTRY(browser->location), location_uri);
 
+	if(webkit_uri_for_display(location_uri) != location_uri)
+		gtk_widget_set_tooltip_text(browser->location, webkit_uri_for_display(location_uri));
+	else
+		gtk_widget_set_has_tooltip(browser->location, false);
+
 	return TRUE;
 }
 
@@ -317,7 +322,7 @@ WebViewCb_mouse_target_changed(WebKitWebView *webView,
 	struct Client *browser = (struct Client *)user_data;
 	const gchar *link_uri  = webkit_hit_test_result_get_link_uri(hit);
 
-	gtk_label_set_text(GTK_LABEL(browser->statuslabel), link_uri);
+	gtk_label_set_text(GTK_LABEL(browser->statuslabel), webkit_uri_for_display(link_uri));
 
 	return TRUE;
 }