[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - libreofficekit/source

[Debarshi Ray]

 libreofficekit/source/gtk/lokdocview.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f6cb113a9a6a55de34bf2fab6da757275ead6ea
Author: Debarshi Ray <debarshir at freedesktop.org>
Date:   Fri Jan 8 18:06:18 2016 +0100

    lokdocview: Fix WARNING when creating an error
    
    A GError needs a valid GQuark as the domain. Passing 0 leads to:
      GLib-WARNING **: (gerror.c:408):g_error_new_valist: runtime check
        failed: (domain != 0)
    
    Change-Id: I2f252eaa83a1519b5d16c7ba22c8f593732807ca
    Reviewed-on: https://gerrit.libreoffice.org/21261
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Pranav Kant <pranavk at gnome.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    (cherry picked from commit 3ba1b60c97b342c13593d37ccf2b97a919808dfc)
    Reviewed-on: https://gerrit.libreoffice.org/21384
    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 fc58dd4..21232df 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1681,7 +1681,7 @@ openDocumentInThread (gpointer data)
     if ( !priv->m_pDocument )
     {
         char *pError = priv->m_pOffice->pClass->getError( priv->m_pOffice );
-        g_task_return_new_error(task, 0, 0, "%s", pError);
+        g_task_return_new_error(task, g_quark_from_static_string ("LOK error"), 0, "%s", pError);
     }
     else
     {