callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EWebView: Unset has-selection flag on content load start

Browse Source 
The flag could be left set from the previous content, thus
unset it, to stay consistent with the GUI. The outcome was
that the related actions in the context menu had been shown
even when they should not be.
This commit is contained in:
Milan Crha
2022-06-09 08:10:21 +02:00
parent 2de495a0a3
commit 8cb5fbbcf4
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/e-util/e-web-view.c
View File

@ -844,6 +844,20 @@ style_updated_cb (EWebView *web_view)
e_web_view_update_styles (web_view, "*");
}
static void
e_web_view_set_has_selection (EWebView *web_view,
gboolean has_selection)
{
g_return_if_fail (E_IS_WEB_VIEW (web_view));
if ((!web_view->priv->has_selection) == (!has_selection))
return;
web_view->priv->has_selection = has_selection;
g_object_notify (G_OBJECT (web_view), "has-selection");
}
static void
web_view_load_changed_cb (WebKitWebView *webkit_web_view,
WebKitLoadEvent load_event,
@ -853,8 +867,10 @@ web_view_load_changed_cb (WebKitWebView *webkit_web_view,
web_view = E_WEB_VIEW (webkit_web_view);
if (load_event == WEBKIT_LOAD_STARTED)
if (load_event == WEBKIT_LOAD_STARTED) {
g_hash_table_remove_all (web_view->priv->element_clicked_cbs);
e_web_view_set_has_selection (web_view, FALSE);
}
if (load_event != WEBKIT_LOAD_FINISHED)
return;
@ -1482,21 +1498,6 @@ e_web_view_content_loaded_cb (WebKitUserContentManager *manager,
g_free (iframe_id);
}
static void
e_web_view_set_has_selection (EWebView *web_view,
gboolean has_selection)
{
g_return_if_fail (E_IS_WEB_VIEW (web_view));
if ((!web_view->priv->has_selection) == (!has_selection))
return;
web_view->priv->has_selection = has_selection;
g_object_notify (G_OBJECT (web_view), "has-selection");
}
static void
e_web_view_has_selection_cb (WebKitUserContentManager *manager,
WebKitJavascriptResult *js_result,