[evolution/wip/webkit2] Fix regressions after "Fix various leaks of WebKit DOM objects"
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit2] Fix regressions after "Fix various leaks of WebKit DOM objects"
- Date: Wed, 7 Oct 2015 07:32:19 +0000 (UTC)
commit 20320fc8ec0d57fec2b31b1e15bfc30a14f8c1b1
Author: Tomas Popela <tpopela redhat com>
Date: Tue May 12 17:00:44 2015 +0200
Fix regressions after "Fix various leaks of WebKit DOM objects"
.../e-html-editor-selection-dom-functions.c | 8 +++++---
web-extensions/e-html-editor-view-dom-functions.c | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/web-extensions/e-html-editor-selection-dom-functions.c
b/web-extensions/e-html-editor-selection-dom-functions.c
index 41884b1..c40bc89 100644
--- a/web-extensions/e-html-editor-selection-dom-functions.c
+++ b/web-extensions/e-html-editor-selection-dom-functions.c
@@ -69,11 +69,13 @@ dom_get_current_range (WebKitDOMDocument *document)
dom_window = webkit_dom_document_get_default_view (document);
if (!dom_window)
- goto exit;
+ return NULL;
dom_selection = webkit_dom_dom_window_get_selection (dom_window);
- if (!WEBKIT_DOM_IS_DOM_SELECTION (dom_selection))
- goto exit;
+ if (!WEBKIT_DOM_IS_DOM_SELECTION (dom_selection)) {
+ g_object_unref (dom_window);
+ return NULL;
+ }
if (webkit_dom_dom_selection_get_range_count (dom_selection) < 1)
goto exit;
diff --git a/web-extensions/e-html-editor-view-dom-functions.c
b/web-extensions/e-html-editor-view-dom-functions.c
index 0baed85..281aa61 100644
--- a/web-extensions/e-html-editor-view-dom-functions.c
+++ b/web-extensions/e-html-editor-view-dom-functions.c
@@ -162,7 +162,7 @@ perform_spell_check (WebKitDOMDOMSelection *dom_selection,
actual = webkit_dom_dom_selection_get_range_at (
dom_selection, 0, NULL);
}
- g_object_unref (actual);
+ g_clear_object (&actual);
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]