|
 |
91334d |
From 19d92c9c354465b40403f6cccd48ce62ea8e7b04 Mon Sep 17 00:00:00 2001
|
|
|
91334d |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
91334d |
Date: Fri, 5 May 2017 14:34:51 +0100
|
|
|
91334d |
Subject: [PATCH 3/5] rhbz#1444437 gnome-documents finalize may not occur
|
|
|
91334d |
immediately
|
|
|
91334d |
MIME-Version: 1.0
|
|
|
91334d |
Content-Type: text/plain; charset=UTF-8
|
|
|
91334d |
Content-Transfer-Encoding: 8bit
|
|
|
91334d |
|
|
|
91334d |
when LOK Widget is destroyed, it may instead happen during GC of javascript,
|
|
|
91334d |
like in the in gnome-documents case, but "destroy" will be called promptly. So
|
|
|
91334d |
close documents and office in destroy, not finalize
|
|
|
91334d |
|
|
|
91334d |
Change-Id: I1dd7b828839894cb2d87f5c087194fe458ca22f0
|
|
|
91334d |
Reviewed-on: https://gerrit.libreoffice.org/37398
|
|
|
91334d |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
91334d |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
91334d |
(cherry picked from commit c45660df336a640f0f9d4290b881548d25c9db9d)
|
|
|
91334d |
---
|
|
|
91334d |
libreofficekit/source/gtk/lokdocview.cxx | 17 +++++++++++++++--
|
|
|
91334d |
1 file changed, 15 insertions(+), 2 deletions(-)
|
|
|
91334d |
|
|
|
91334d |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
91334d |
index a08d93e..18985d5 100644
|
|
|
91334d |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
91334d |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
91334d |
@@ -2574,9 +2574,12 @@ static gboolean lok_doc_view_draw (GtkWidget* pWidget, cairo_t* pCairo)
|
|
|
91334d |
return FALSE;
|
|
|
91334d |
}
|
|
|
91334d |
|
|
|
91334d |
-static void lok_doc_view_finalize (GObject* object)
|
|
|
91334d |
+//rhbz#1444437 finalize may not occur immediately when this widget is destroyed
|
|
|
91334d |
+//it may happen during GC of javascript, e.g. in gnome-documents but "destroy"
|
|
|
91334d |
+//will be called promptly, so close documents in destroy, not finalize
|
|
|
91334d |
+static void lok_doc_view_destroy (GtkWidget* widget)
|
|
|
91334d |
{
|
|
|
91334d |
- LOKDocView* pDocView = LOK_DOC_VIEW (object);
|
|
|
91334d |
+ LOKDocView* pDocView = LOK_DOC_VIEW (widget);
|
|
|
91334d |
LOKDocViewPrivate& priv = getPrivate(pDocView);
|
|
|
91334d |
|
|
|
91334d |
// Ignore notifications sent to this view on shutdown.
|
|
|
91334d |
@@ -2599,6 +2602,15 @@ static void lok_doc_view_finalize (GObject* object)
|
|
|
91334d |
if (priv->m_pOffice)
|
|
|
91334d |
priv->m_pOffice->pClass->destroy (priv->m_pOffice);
|
|
|
91334d |
}
|
|
|
91334d |
+
|
|
|
91334d |
+ GTK_WIDGET_CLASS (lok_doc_view_parent_class)->destroy (widget);
|
|
|
91334d |
+}
|
|
|
91334d |
+
|
|
|
91334d |
+static void lok_doc_view_finalize (GObject* object)
|
|
|
91334d |
+{
|
|
|
91334d |
+ LOKDocView* pDocView = LOK_DOC_VIEW (object);
|
|
|
91334d |
+ LOKDocViewPrivate& priv = getPrivate(pDocView);
|
|
|
91334d |
+
|
|
|
91334d |
delete priv.m_pImpl;
|
|
|
91334d |
priv.m_pImpl = nullptr;
|
|
|
91334d |
|
|
|
91334d |
@@ -2649,6 +2661,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
|
|
|
91334d |
pWidgetClass->key_press_event = signalKey;
|
|
|
91334d |
pWidgetClass->key_release_event = signalKey;
|
|
|
91334d |
pWidgetClass->motion_notify_event = lok_doc_view_signal_motion;
|
|
|
91334d |
+ pWidgetClass->destroy = lok_doc_view_destroy;
|
|
|
91334d |
|
|
|
91334d |
/**
|
|
|
91334d |
* LOKDocView:lopath:
|
|
|
91334d |
--
|
|
|
91334d |
2.9.3
|
|
|
91334d |
|