|
 |
135360 |
From 6b4439ee8561429eee14e60c62788df63c318f67 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
|
135360 |
Date: Fri, 8 Jan 2016 18:06:18 +0100
|
|
|
135360 |
Subject: [PATCH 386/398] lokdocview: Fix WARNING when creating an error
|
|
|
135360 |
|
|
|
135360 |
A GError needs a valid GQuark as the domain. Passing 0 leads to:
|
|
|
135360 |
GLib-WARNING **: (gerror.c:408):g_error_new_valist: runtime check
|
|
|
135360 |
failed: (domain != 0)
|
|
|
135360 |
|
|
|
135360 |
Change-Id: I2f252eaa83a1519b5d16c7ba22c8f593732807ca
|
|
|
135360 |
Reviewed-on: https://gerrit.libreoffice.org/21261
|
|
|
135360 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
135360 |
Reviewed-by: Pranav Kant <pranavk@gnome.org>
|
|
|
135360 |
Reviewed-by: jan iversen <jani@documentfoundation.org>
|
|
|
135360 |
(cherry picked from commit 3ba1b60c97b342c13593d37ccf2b97a919808dfc)
|
|
|
135360 |
Reviewed-on: https://gerrit.libreoffice.org/21384
|
|
|
135360 |
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
|
135360 |
Tested-by: David Tardon <dtardon@redhat.com>
|
|
|
135360 |
(cherry picked from commit 9f6cb113a9a6a55de34bf2fab6da757275ead6ea)
|
|
|
135360 |
---
|
|
|
135360 |
libreofficekit/source/gtk/lokdocview.cxx | 2 +-
|
|
|
135360 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
135360 |
index 5cfc22d611d7..9774acacad83 100644
|
|
|
135360 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
135360 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
135360 |
@@ -1681,7 +1681,7 @@ openDocumentInThread (gpointer data)
|
|
|
135360 |
if ( !priv->m_pDocument )
|
|
|
135360 |
{
|
|
|
135360 |
char *pError = priv->m_pOffice->pClass->getError( priv->m_pOffice );
|
|
|
135360 |
- g_task_return_new_error(task, 0, 0, "%s", pError);
|
|
|
135360 |
+ g_task_return_new_error(task, g_quark_from_static_string ("LOK error"), 0, "%s", pError);
|
|
|
135360 |
}
|
|
|
135360 |
else
|
|
|
135360 |
{
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|