[Libreoffice-commits] core.git: libreofficekit/source

Pranav Kant pranavk at libreoffice.org
Thu Dec 17 07:44:47 PST 2015


 libreofficekit/source/gtk/lokdocview.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 244aad533b0fd714136f4f62b5a07fc136c740f0
Author: Pranav Kant <pranavk at libreoffice.org>
Date:   Sun Dec 13 10:48:45 2015 +0530

    lokdocview: Remove an easy FIXME
    
    Change-Id: I8305f3eb45330f457089ca0524a0df004410f59c
    Reviewed-on: https://gerrit.libreoffice.org/20774
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 85aa1be..f1375dd 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2430,8 +2430,7 @@ lok_doc_view_open_document_finish (LOKDocView* pDocView, GAsyncResult* res, GErr
     GTask* task = G_TASK(res);
 
     g_return_val_if_fail(g_task_is_valid(res, pDocView), false);
-    //FIXME: make source_tag work
-    //g_return_val_if_fail(g_task_get_source_tag(task) == lok_doc_view_open_document, NULL);
+    g_return_val_if_fail(g_task_get_source_tag(task) == lok_doc_view_open_document, false);
     g_return_val_if_fail(error == nullptr || *error == nullptr, false);
 
     return g_task_propagate_boolean(task, error);
@@ -2456,6 +2455,7 @@ lok_doc_view_open_document (LOKDocView* pDocView,
     if (pRenderingArguments)
         priv->m_aRenderingArguments = pRenderingArguments;
     g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
+    g_task_set_source_tag(task, reinterpret_cast<gpointer>(lok_doc_view_open_document));
 
     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
     if (error != nullptr)


More information about the Libreoffice-commits mailing list