[evolution/wip/webkit2] EWebKitEditor - Copy, Cut and Paste does not work
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit2] EWebKitEditor - Copy, Cut and Paste does not work
- Date: Fri, 15 Jul 2016 12:28:37 +0000 (UTC)
commit 962e0621e93f5146c9818b4856aa26ea9729617c
Author: Tomas Popela <tpopela redhat com>
Date: Fri Jul 15 14:04:50 2016 +0200
EWebKitEditor - Copy, Cut and Paste does not work
modules/webkit-editor/e-webkit-editor.c | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/modules/webkit-editor/e-webkit-editor.c b/modules/webkit-editor/e-webkit-editor.c
index 295522e..0004486 100644
--- a/modules/webkit-editor/e-webkit-editor.c
+++ b/modules/webkit-editor/e-webkit-editor.c
@@ -1501,8 +1501,8 @@ webkit_editor_insert_content (EContentEditor *editor,
NULL,
NULL,
NULL);
- } else if ((flags & E_CONTENT_EDITOR_INSERT_CONVERT) &&
- !(flags & E_CONTENT_EDITOR_INSERT_REPLACE_ALL)) {
+ } else if (!(flags & E_CONTENT_EDITOR_INSERT_CONVERT) &&
+ !(flags & E_CONTENT_EDITOR_INSERT_REPLACE_ALL)) {
// e_html_editor_view_insert_html
g_dbus_proxy_call (
wk_editor->priv->web_extension,
@@ -1863,7 +1863,6 @@ static void
webkit_editor_cut (EContentEditor *editor)
{
EWebKitEditor *wk_editor;
- gboolean handled = FALSE;
wk_editor = E_WEBKIT_EDITOR (editor);
@@ -1872,28 +1871,21 @@ webkit_editor_cut (EContentEditor *editor)
webkit_editor_call_simple_extension_function (
wk_editor, "EEditorActionsSaveHistoryForCut");
- g_signal_emit_by_name (editor, "cut-clipboard", editor, &handled);
-
- if (!handled)
- webkit_web_view_execute_editing_command (
- WEBKIT_WEB_VIEW (wk_editor), WEBKIT_EDITING_COMMAND_CUT);
+ webkit_web_view_execute_editing_command (
+ WEBKIT_WEB_VIEW (wk_editor), WEBKIT_EDITING_COMMAND_CUT);
}
static void
webkit_editor_copy (EContentEditor *editor)
{
EWebKitEditor *wk_editor;
- gboolean handled = FALSE;
wk_editor = E_WEBKIT_EDITOR (editor);
wk_editor->priv->copy_cut_actions_triggered = TRUE;
- g_signal_emit_by_name (editor, "copy-clipboard", editor, &handled);
-
- if (!handled)
- webkit_web_view_execute_editing_command (
- WEBKIT_WEB_VIEW (wk_editor), WEBKIT_EDITING_COMMAND_COPY);
+ webkit_web_view_execute_editing_command (
+ WEBKIT_WEB_VIEW (wk_editor), WEBKIT_EDITING_COMMAND_COPY);
}
static ESpellChecker *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]