[sushi] sushi-pdf-loader: correctly pass argv as an array
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sushi] sushi-pdf-loader: correctly pass argv as an array
- Date: Fri, 20 Apr 2018 18:25:17 +0000 (UTC)
commit 37d9ab8788c233c33829d81ca900570ebc4b2321
Author: Cosimo Cecchi <cosimo endlessm com>
Date: Fri Apr 20 11:22:08 2018 -0700
sushi-pdf-loader: correctly pass argv as an array
This should fix LibreOffice conversion once again.
src/libsushi/sushi-pdf-loader.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/libsushi/sushi-pdf-loader.c b/src/libsushi/sushi-pdf-loader.c
index 7f13f8c..c1f3649 100644
--- a/src/libsushi/sushi-pdf-loader.c
+++ b/src/libsushi/sushi-pdf-loader.c
@@ -209,7 +209,7 @@ load_libreoffice (SushiPdfLoader *self)
gboolean res;
GPid pid;
GError *error = NULL;
- const gchar *argv = NULL;
+ const gchar **argv = NULL;
flatpak_path = g_find_program_in_path ("flatpak");
if (flatpak_path != NULL)
@@ -265,7 +265,7 @@ load_libreoffice (SushiPdfLoader *self)
flatpak_argv[10] = pdf_dir;
flatpak_argv[11] = doc_path;
- argv = (const gchar *) &flatpak_argv[0];
+ argv = flatpak_argv;
} else {
const gchar *libreoffice_argv[] = {
NULL, /* to be replaced with binary */
@@ -279,7 +279,7 @@ load_libreoffice (SushiPdfLoader *self)
libreoffice_argv[4] = pdf_dir;
libreoffice_argv[5] = doc_path;
- argv = (const gchar *) &libreoffice_argv[0];
+ argv = libreoffice_argv;
}
tmp_name = g_strjoinv (" ", (gchar **) argv);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]