[Libreoffice-commits] .: desktop/unx

[Michael Meeks]

 desktop/unx/source/start.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 022af09377d9ea1a6873cdbc5bd3109e145be236
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Mar 23 08:49:03 2011 +0000

    fixup paths to pagein files

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 2e67e6c..b59eb7d 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -721,14 +721,22 @@ void
 exec_pagein (Args *args)
 {
     char *argv[5];
+    rtl_String *app_path;
+
+    app_path = ustr_to_str (args->pAppPath);
 
     argv[0] = "dummy-pagein";
-    argv[1] = "-L../basis-link/program";
+    argv[1] = malloc (app_path->length + sizeof ("-L/../basis-link/program") + 2);
+    strcpy (argv[1], "-L");
+    strcat (argv[1], app_path->buffer);
+    strcat (argv[1], "/../basis-link/program");
     argv[2] = "@pagein-common";
     argv[3] = (char *)args->pPageinType;
     argv[4] = NULL;
 
     pagein_execute (args->pPageinType ? 4 : 3, argv);
+
+    free (argv[1]);
 }
 
 static void extend_library_path (const char *new_element)