[evolution] Bug 747575 - EHTMLEditorView never freed
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 747575 - EHTMLEditorView never freed
- Date: Mon, 13 Apr 2015 08:12:08 +0000 (UTC)
commit 3a123fee253fc39b50b34bc727d56ccf3af39065
Author: Tomas Popela <tpopela redhat com>
Date: Mon Apr 13 10:08:22 2015 +0200
Bug 747575 - EHTMLEditorView never freed
Main cause was regression after commit 3f19190f18a616c076d99973dfefd2e3d1b0f5d8
and also fixed another leak of EHTMLEditorView.
e-util/e-html-editor-selection.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c
index d3768c5..b8d1cc7 100644
--- a/e-util/e-html-editor-selection.c
+++ b/e-util/e-html-editor-selection.c
@@ -113,6 +113,7 @@ html_editor_selection_get_current_range (EHTMLEditorSelection *selection)
g_return_val_if_fail (view != NULL, NULL);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
+ g_object_unref (view);
dom_window = webkit_dom_document_get_default_view (document);
if (!dom_window)
return NULL;
@@ -123,12 +124,10 @@ html_editor_selection_get_current_range (EHTMLEditorSelection *selection)
return NULL;
}
- if (webkit_dom_dom_selection_get_range_count (dom_selection) < 1) {
+ if (webkit_dom_dom_selection_get_range_count (dom_selection) < 1)
goto exit;
- }
range = webkit_dom_dom_selection_get_range_at (dom_selection, 0, NULL);
-
exit:
g_object_unref (dom_selection);
g_object_unref (dom_window);
@@ -3164,8 +3163,10 @@ e_html_editor_selection_set_font_size (EHTMLEditorSelection *selection,
g_return_if_fail (view != NULL);
current_font_size = e_html_editor_selection_get_font_size (selection);
- if (current_font_size == font_size)
+ if (current_font_size == font_size) {
+ g_object_unref (view);
return;
+ }
e_html_editor_selection_save (selection);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]