[evolution/gnome-3-16] EHTMLEditorSelection - Don't perform actions on selection-changed callback when we cannot obtain val
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-16] EHTMLEditorSelection - Don't perform actions on selection-changed callback when we cannot obtain val
- Date: Tue, 21 Apr 2015 06:40:30 +0000 (UTC)
commit 0f12bfa67d87eaf5eaf3ff5665883f71e47e1722
Author: Tomas Popela <tpopela redhat com>
Date: Mon Apr 20 16:42:33 2015 +0200
EHTMLEditorSelection - Don't perform actions on selection-changed callback when we cannot obtain valid
range
e-util/e-html-editor-selection.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c
index a8cf1fd..c0f5f53 100644
--- a/e-util/e-html-editor-selection.c
+++ b/e-util/e-html-editor-selection.c
@@ -232,9 +232,12 @@ static void
html_editor_selection_selection_changed_cb (WebKitWebView *web_view,
EHTMLEditorSelection *selection)
{
- EHTMLEditorView *view;
+ WebKitDOMRange *range = NULL;
- view = e_html_editor_selection_ref_html_editor_view (selection);
+ range = html_editor_selection_get_current_range (selection);
+ if (!range)
+ return;
+ g_object_unref (range);
g_object_freeze_notify (G_OBJECT (selection));
@@ -243,7 +246,7 @@ html_editor_selection_selection_changed_cb (WebKitWebView *web_view,
g_object_notify (G_OBJECT (selection), "indented");
g_object_notify (G_OBJECT (selection), "text");
- if (!e_html_editor_view_get_html_mode (view))
+ if (!e_html_editor_view_get_html_mode (E_HTML_EDITOR_VIEW (web_view)))
goto out;
g_object_notify (G_OBJECT (selection), "background-color");
@@ -259,7 +262,6 @@ html_editor_selection_selection_changed_cb (WebKitWebView *web_view,
g_object_notify (G_OBJECT (selection), "underline");
out:
- g_object_unref (view);
g_object_thaw_notify (G_OBJECT (selection));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]