X-Git-Url: https://git.armaanb.net/?p=chorizo.git;a=blobdiff_plain;f=browser.c;h=3e0a4a7df8e40858942fb3b38dd27848b67b0578;hp=8df0e330777700e743a953d9cd7123db95e30109;hb=74bdc3ed21d74d464cd94c5ca461b9ba7d10616b;hpb=13ca54ace5c670f72745579852481f1a923d3d22 diff --git a/browser.c b/browser.c index 8df0e33..3e0a4a7 100644 --- a/browser.c +++ b/browser.c @@ -767,28 +767,23 @@ hover_web_view(WebKitWebView *web_view, WebKitHitTestResult *ht, guint modifiers gpointer data) { struct Client *c = (struct Client *)data; + const char *to_show; - if (!gtk_widget_is_focus(c->location)) - { - if (webkit_hit_test_result_context_is_link(ht)) - { - gtk_entry_set_text(GTK_ENTRY(c->location), - webkit_hit_test_result_get_link_uri(ht)); - - if (c->hover_uri != NULL) - g_free(c->hover_uri); - c->hover_uri = g_strdup(webkit_hit_test_result_get_link_uri(ht)); - } - else - { - gtk_entry_set_text(GTK_ENTRY(c->location), - webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view))); + g_free(c->hover_uri); - if (c->hover_uri != NULL) - g_free(c->hover_uri); - c->hover_uri = NULL; - } + if (webkit_hit_test_result_context_is_link(ht)) + { + to_show = webkit_hit_test_result_get_link_uri(ht); + c->hover_uri = g_strdup(to_show); } + else + { + to_show = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view)); + c->hover_uri = NULL; + } + + if (!gtk_widget_is_focus(c->location)) + gtk_entry_set_text(GTK_ENTRY(c->location), to_show); } void