|
 |
f325b2 |
From f921217577611da13e097a34c18e589e09850927 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Pranav Kant <pranavk@libreoffice.org>
|
|
|
f325b2 |
Date: Sun, 13 Dec 2015 10:48:45 +0530
|
|
|
f325b2 |
Subject: [PATCH 373/398] lokdocview: Remove an easy FIXME
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I8305f3eb45330f457089ca0524a0df004410f59c
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/20774
|
|
|
f325b2 |
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
Tested-by: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
(cherry picked from commit 244aad533b0fd714136f4f62b5a07fc136c740f0)
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/21263
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: Pranav Kant <pranavk@gnome.org>
|
|
|
f325b2 |
(cherry picked from commit 2bb2c450a741a539be69494b5308428d07c56adf)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 4 ++--
|
|
|
f325b2 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 927f4b509bb8..a3e6b21165d9 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -2428,8 +2428,7 @@ lok_doc_view_open_document_finish (LOKDocView* pDocView, GAsyncResult* res, GErr
|
|
|
f325b2 |
GTask* task = G_TASK(res);
|
|
|
f325b2 |
|
|
|
f325b2 |
g_return_val_if_fail(g_task_is_valid(res, pDocView), false);
|
|
|
f325b2 |
- //FIXME: make source_tag work
|
|
|
f325b2 |
- //g_return_val_if_fail(g_task_get_source_tag(task) == lok_doc_view_open_document, NULL);
|
|
|
f325b2 |
+ g_return_val_if_fail(g_task_get_source_tag(task) == lok_doc_view_open_document, false);
|
|
|
f325b2 |
g_return_val_if_fail(error == nullptr || *error == nullptr, false);
|
|
|
f325b2 |
|
|
|
f325b2 |
return g_task_propagate_boolean(task, error);
|
|
|
f325b2 |
@@ -2454,6 +2453,7 @@ lok_doc_view_open_document (LOKDocView* pDocView,
|
|
|
f325b2 |
if (pRenderingArguments)
|
|
|
f325b2 |
priv->m_aRenderingArguments = pRenderingArguments;
|
|
|
f325b2 |
g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
|
|
|
f325b2 |
+ g_task_set_source_tag(task, reinterpret_cast<gpointer>(lok_doc_view_open_document));
|
|
|
f325b2 |
|
|
|
f325b2 |
g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
|
|
|
f325b2 |
if (error != nullptr)
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|